Merge branch 'master' of ssh://git.mdrn.pl/django-ssify
authorRadek Czajka <radekczajka@nowoczesnapolska.org.pl>
Thu, 16 Apr 2015 13:21:01 +0000 (15:21 +0200)
committerRadek Czajka <radekczajka@nowoczesnapolska.org.pl>
Thu, 16 Apr 2015 13:21:01 +0000 (15:21 +0200)
commit325450f83527058794f7b9f5e76348afa9a06ec4
treea80c379939115ff4b2036555b03bd449b3b3f381
parent9c5fe2012a14bf1c840e304b1bd1d9f72fffba6a
parente89d22d4e7a6d5846fe964851b0f1a209bf0a521
Merge branch 'master' of ssh://git.mdrn.pl/django-ssify

Conflicts:
tox.ini
tox.ini