Merge branch 'stable'

Conflicts:
	mediagoblin/i18n/templates/en/mediagoblin.po
	mediagoblin/plugins/archivalook/tools.py
This commit is contained in:
Christopher Allan Webber 2015-12-19 21:57:27 -06:00
commit 86d01f0816

View File

@ -9,7 +9,6 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2015-07-22 11:22+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"