From: Tony Baldwin <tony@baldwinsoftware.com>
Date: Sat, 17 Mar 2012 21:16:57 +0000 (-0400)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f75d96e5bc0eda7118717f38da913f82a1aecb56;p=friendica-addons.git

Merge remote branch 'upstream/master'
---

f75d96e5bc0eda7118717f38da913f82a1aecb56
diff --cc dwpost/dwpost.php
index bb455726,5f8dcc73..85e808c0
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@@ -4,8 -4,9 +4,9 @@@
   * Name: Dreamwidth Post Connector
   * Description: Post to dreamwidth
   * Version: 1.0
 - * Author: Tony Baldwin <http://tonybaldwin.me/friendica/profile/tony>
 + * Author: Tony Baldwin <https://free-haven.org/profile/tony>
   * Author: Michael Johnston
+  * Author: Cat Gray <https://free-haven.org/profile/catness>
   */
  
  function dwpost_install() {
diff --cc ljpost/ljpost.php
index 14bac69e,e1bd2d63..ddcd2890
mode 100644,100755..100755
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@@ -4,8 -4,9 +4,9 @@@
   * Name: LiveJournal Post Connector
   * Description: Post to LiveJournal
   * Version: 1.0
 - * Author: Tony Baldwin <http://tonybaldwin.me/friendica/profile/tony>
 + * Author: Tony Baldwin <https://free-haven.org/profile/tony>
   * Author: Michael Johnston
+  * Author: Cat Gray <https://free-haven.org/profile/catness>
   */
  
  function ljpost_install() {