Skip to content

Commit c1bb7dc

Browse files
author
Mark Unsworth
committed
Merge remote-tracking branch 'upstream/master' into feature/pymongo_3
2 parents fef0185 + e015ca5 commit c1bb7dc

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ env:
1515
- DJANGO_VERSION=1.4
1616
- DJANGO_VERSION=1.5
1717
- DJANGO_VERSION=1.6
18-
- DJANGO_VERSION=1.6-beta
1918
- DJANGO_VERSION=1.7
2019

20+
2121
matrix:
2222
allow_failures:
2323
- env: DJANGO_VERSION=1.4

CHANGELOG.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ Changelog
33

44
.. currentmodule:: djangotoolbox.fields
55

6-
Version 0.5.2 (TBD)
6+
Version 0.5.2 (Jun 19, 2015)
77
-----------------
88
* Add support for Replica Sets (Thanks @r4fek)
9+
* Make safe writes the default (Thanks @markunsworth)
910

1011

1112
Version 0.5.1 (Nov 2013)

0 commit comments

Comments
 (0)