From: Lukasz Date: Tue, 18 May 2010 08:30:32 +0000 (+0200) Subject: Merge branch 'master' of http://github.com/fnp/wolnelektury X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/735368cfb54c8954518179993dcd3bc55e3878e7?ds=inline;hp=735368cfb54c8954518179993dcd3bc55e3878e7 Merge branch 'master' of github.com/fnp/wolnelektury Conflicts: wolnelektury/settings.py wolnelektury/templates/catalogue/book_stub_detail.html wolnelektury/templates/catalogue/search_no_hits.html wolnelektury/templates/catalogue/tagged_object_list.html ---