corrections after merge
authorJan Szejko <j-sz@o2.pl>
Mon, 1 Feb 2016 09:16:31 +0000 (10:16 +0100)
committerJan Szejko <j-sz@o2.pl>
Mon, 1 Feb 2016 09:27:59 +0000 (10:27 +0100)
commitd38155ea08184f51939e9e75609d5916a810ea54
tree17b6ea557364a567ff042ae82e4f70a9e1b872bb
parentae60b2a3949e96357477cc04f90fd0873cee8a92
corrections after merge
apps/catalogue/templates/catalogue/menu.html [deleted file]
src/wolnelektury/settings/static.py
wolnelektury/settings/static.py [deleted file]