]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1cdc5a e11b51a)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Mon, 27 Feb 2012 18:34:19 +0000 (13:34 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Mon, 27 Feb 2012 18:34:19 +0000 (13:34 -0500)
* remotes/upstream/master:
  revert 01a2791e3a to avoid random preg internal errors. fix contact_template

* master:


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