diff options
author | redmatrix <redmatrix@redmatrix.me> | 2015-10-09 14:27:47 -0700 |
---|---|---|
committer | redmatrix <redmatrix@redmatrix.me> | 2015-10-09 14:27:47 -0700 |
commit | d076255c98a2fafda61f331fa9d8fcd0253c1bc4 (patch) | |
tree | 052efaf9ae09cb9da989652b2a2bf01e7ed6c770 /util/messages.po | |
parent | 5390594f4015eed6a1d728fb420c76cccf0d7a99 (diff) | |
parent | b2f2deffe6a0548666c74e7687dc99a5445ae775 (diff) | |
download | volse-hubzilla-d076255c98a2fafda61f331fa9d8fcd0253c1bc4.tar.gz volse-hubzilla-d076255c98a2fafda61f331fa9d8fcd0253c1bc4.tar.bz2 volse-hubzilla-d076255c98a2fafda61f331fa9d8fcd0253c1bc4.zip |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
mod/uexport.php
view/tpl/uexport.tpl
Diffstat (limited to 'util/messages.po')
-rw-r--r-- | util/messages.po | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/messages.po b/util/messages.po index 07c6e08fa..947acab5b 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2015-10-02.1173\n" +"Project-Id-Version: 2015-10-09.1180\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-02 00:04-0700\n" +"POT-Creation-Date: 2015-10-09 00:04-0700\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" |