Merge remote-tracking branch 'origin/master'
authorJan Szejko <j-sz@o2.pl>
Wed, 16 Mar 2016 14:58:43 +0000 (15:58 +0100)
committerJan Szejko <j-sz@o2.pl>
Wed, 16 Mar 2016 14:58:43 +0000 (15:58 +0100)
commit74378d009ec094bd52789bcb5f1a7be89c3509de
tree18c749bab5726feaaf6b555c2d8afdc80db89a2e
parentb8c343054791fed1329bf58185c1725caa5432a1
parent95c28f52a82c1909d03fa5b8a97925173986e212
Merge remote-tracking branch 'origin/master'
apps/catalogue/templates/catalogue/base.html