From: Guillaume Pellerin Date: Thu, 18 Aug 2016 11:22:02 +0000 (+0200) Subject: Merge branch 'orderable' into dev X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d34b01ac1a6a866e43940511c570f217f7180cb9;p=mezzo.git Merge branch 'orderable' into dev Conflicts: app/scripts/app.sh --- d34b01ac1a6a866e43940511c570f217f7180cb9 diff --cc app/templates/base.html index 257270ab,257270ab..b81fac92 --- a/app/templates/base.html +++ b/app/templates/base.html @@@ -1,3 -1,3 +1,4 @@@ ++ {% load i18n pages_tags mezzanine_tags staticfiles keyword_tags event_tags featured_tags %}