]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f0fdd1a f1bf6dc)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Fri, 2 Mar 2012 09:53:54 +0000 (04:53 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Fri, 2 Mar 2012 09:53:54 +0000 (04:53 -0500)
* remotes/upstream/master:
  expand multiple heart smilies e.g. <3333

* master:


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