From: Michael <heluecht@pirati.ca>
Date: Wed, 12 Jan 2022 21:29:03 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/2021.12-rc' into advanced-cleaned
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=43779c2c92f2c2493684f754801593da7770396d;p=friendica.git

Merge remote-tracking branch 'upstream/2021.12-rc' into advanced-cleaned
---

43779c2c92f2c2493684f754801593da7770396d
diff --cc view/lang/C/messages.po
index db0ead2c25,cc19cc16d7..46cefc9b0d
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@@ -8,7 -8,7 +8,11 @@@ msgid "
  msgstr ""
  "Project-Id-Version: 2021.12-rc\n"
  "Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
 +"POT-Creation-Date: 2022-01-12 21:16+0000\n"
++=======
+ "POT-Creation-Date: 2022-01-09 12:31-0500\n"
++>>>>>>> upstream/2021.12-rc
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"