Merge branch 'master' into obrazy
authorMarcin Koziej <marcin@lolownia.org>
Sat, 7 Dec 2013 18:16:09 +0000 (19:16 +0100)
committerMarcin Koziej <marcin@lolownia.org>
Sat, 7 Dec 2013 18:16:09 +0000 (19:16 +0100)
commit3726f9b225fb5c39cbf067f53d4cf6f7d8a9f326
treece8c6067bc8979043532f022fa5db543bd1afc79
parent1ff260641b29888f28d24acb58195ea231207494
parent4c0a2cdc4ea9531a47943ececfa3dc656a0462f1
Merge branch 'master' into obrazy
apps/catalogue/models/tag.py
apps/catalogue/urls.py
apps/catalogue/views.py