Merge branch 'orderable' into dev

author Guillaume Pellerin <guillaume.pellerin@ircam.fr>

Thu, 18 Aug 2016 11:22:02 +0000 (13:22 +0200)

committer Guillaume Pellerin <guillaume.pellerin@ircam.fr>

Thu, 18 Aug 2016 11:22:02 +0000 (13:22 +0200)
author Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 18 Aug 2016 11:22:02 +0000 (13:22 +0200)
committer Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 18 Aug 2016 11:22:02 +0000 (13:22 +0200)
diff --cc app/organization/magazine/models.py
Simple merge
diff --cc app/templates/base.html

index 257270abd3145f06139ec06bdfe108e97f0d9de4,257270abd3145f06139ec06bdfe108e97f0d9de4..b81fac9232ddbcf3b7fabb64309c1d31b505a182
--- 1/app/templates/base.html
--- 2/app/templates/base.html
+++ b/app/templates/base.html
@@@ -1,3 -1,3 +1,4 @@@
++
   <!doctype html>
   <html lang="{{ LANGUAGE_CODE }}"{% if LANGUAGE_BIDI %} dir="rtl"{% endif %}>
   {% load i18n pages_tags mezzanine_tags staticfiles keyword_tags event_tags featured_tags %}
author	Guillaume Pellerin <guillaume.pellerin@ircam.fr>
	Thu, 18 Aug 2016 11:22:02 +0000 (13:22 +0200)
committer	Guillaume Pellerin <guillaume.pellerin@ircam.fr>
	Thu, 18 Aug 2016 11:22:02 +0000 (13:22 +0200)
		1	2
app/organization/magazine/models.py	patch \|	diff1 \|	diff2 \|	blob \| history
app/templates/base.html	patch \|	diff1 \|	diff2 \|	blob \| history