]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 311f39f b7bda75)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Wed, 18 Apr 2012 10:11:54 +0000 (06:11 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Wed, 18 Apr 2012 10:11:54 +0000 (06:11 -0400)
* remotes/upstream/master:

* master:


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