]> git.mxchange.org Git - friendica-addons.git/commitdiff
projects / friendica-addons.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f5a58f3 7b86f5b)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Thu, 1 Mar 2012 17:54:27 +0000 (12:54 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Thu, 1 Mar 2012 17:54:27 +0000 (12:54 -0500)
* remotes/upstream/master:
  xml escape ljpost vars
  Add Thomas Willingham contributed alternate version

* master:


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.