Merge branch 'master' into forum
authorAleksander Łukasz <aleksander.lukasz@nowoczesnapolska.org.pl>
Tue, 13 Aug 2013 10:52:53 +0000 (12:52 +0200)
committerAleksander Łukasz <aleksander.lukasz@nowoczesnapolska.org.pl>
Tue, 13 Aug 2013 10:52:53 +0000 (12:52 +0200)
commit32ac950fc8d6ba7ef7ec4bf1c4b05f2ed25b02fd
tree2c2cfcbd3461eb7fcdb3cef2edec3283fbf7450f
parent311b474e0ac168a93fed2dec0c784d28d7660c6b
parent6585e1a054f95d439e8dc8b7216eb25193dc9d20
Merge branch 'master' into forum
edumed/settings.d/30-apps.py
requirements.txt