projects / mediagoblin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f1db51e 6e38fec)
Merge branch 'stable'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 20 Dec 2015 03:57:27 +0000 (21:57 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 20 Dec 2015 03:57:27 +0000 (21:57 -0600)
Conflicts:
mediagoblin/i18n/templates/en/mediagoblin.po
mediagoblin/plugins/archivalook/tools.py

1  2 
mediagoblin/i18n/templates/en/mediagoblin.po patch | diff1 | diff2 | blob | history

diff --cc mediagoblin/i18n/templates/en/mediagoblin.po
index 1fb234913cdd10c843a40c7fb7dbe0614340972b,057daccd03dd2c552335fbe44b5b107c05dca892..9c3b9c49cbd6e17547fd7d730c6feacd2fc8281d
--- 1/mediagoblin/i18n/templates/en/mediagoblin.po
--- 2/mediagoblin/i18n/templates/en/mediagoblin.po
+++ b/mediagoblin/i18n/templates/en/mediagoblin.po
@@@ -8,8 -8,8 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PROJECT VERSION\n"
  "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 -"POT-Creation-Date: 2015-07-22 11:25+0300\n"
 -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\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"
Unnamed repository; edit this file 'description' to name the repository.