Merge branch 'leveling'
authorRadek Czajka <radekczajka@nowoczesnapolska.org.pl>
Fri, 31 Jan 2014 14:51:59 +0000 (15:51 +0100)
committerRadek Czajka <radekczajka@nowoczesnapolska.org.pl>
Fri, 31 Jan 2014 14:51:59 +0000 (15:51 +0100)
commit118fd7ac41a586001b4c8f45c149731cc9a2e586
tree90a129b8c2b7f42ead5edafd436b8663c0d8b222
parent543746a467e90915f7eaf60b7b09f5fa498056e0
parentea300f6c03d47f6c17dd7721b8d6690489af79da
Merge branch 'leveling'

Conflicts:
edumed/settings.d/30-apps.py
edumed/settings.d/30-apps.py
edumed/settings.d/40-middleware.py
edumed/settings.d/50-static.py
edumed/templates/base_super.html
requirements.txt