fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: ae60b2a)
Merge branch 'reflow'
authorJan Szejko <j-sz@o2.pl>
Mon, 1 Feb 2016 08:55:02 +0000 (09:55 +0100)
committerJan Szejko <j-sz@o2.pl>
Mon, 1 Feb 2016 08:55:02 +0000 (09:55 +0100)
Conflicts:
apps/catalogue/templates/catalogue/menu.html
src/catalogue/management/commands/importbooks.py
src/catalogue/templatetags/catalogue_tags.py
src/catalogue/urls.py
wolnelektury/settings/static.py


No differences found