JC Brand 810f5dec95 Merge branch 'sane-mockup' ... Conflicts: docs/html/searchindex.js index.html		2013-08-24 15:44:58 +02:00
..
doctrees	Update docs to mention new way to minify. Fixes #39	2013-08-20 22:53:19 +02:00
html	Merge branch 'sane-mockup'	2013-08-24 15:44:58 +02:00
source	Mention i18n/locales setting	2013-08-24 03:09:57 +02:00