diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2015-12-19 21:57:27 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2015-12-19 21:57:27 -0600 |
| commit | 86d01f0816d3ccfb481a0e4218aa68d8e780c4f1 (patch) | |
| tree | 7f67ae6862f2b21f9d9c661e6670867c8c028f94 | |
| parent | f1db51e4db689a7f68973ce466b01918af1f4e37 (diff) | |
| parent | 6e38fec80ebaadc3b3cfdc912f40cc4e8bb9b31c (diff) | |
| download | mediagoblin-86d01f0816d3ccfb481a0e4218aa68d8e780c4f1.tar.lz mediagoblin-86d01f0816d3ccfb481a0e4218aa68d8e780c4f1.tar.xz mediagoblin-86d01f0816d3ccfb481a0e4218aa68d8e780c4f1.zip | |
Merge branch 'stable'
Conflicts:
mediagoblin/i18n/templates/en/mediagoblin.po
mediagoblin/plugins/archivalook/tools.py
| -rw-r--r-- | mediagoblin/i18n/templates/en/mediagoblin.po | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mediagoblin/i18n/templates/en/mediagoblin.po b/mediagoblin/i18n/templates/en/mediagoblin.po index 1fb23491..9c3b9c49 100644 --- a/mediagoblin/i18n/templates/en/mediagoblin.po +++ b/mediagoblin/i18n/templates/en/mediagoblin.po @@ -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" |