]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 58c557b) | patch
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Wed, 7 Mar 2012 17:32:28 +0000 (12:32 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Wed, 7 Mar 2012 17:32:28 +0000 (12:32 -0500)
commit4d58357b153bbbb47996bddd03bb835ba9a1793b
tree4ddb60fea72a88706a5ea8a8dd08e3231e58b351tree | snapshot
parent58c557b3ad73cd5699d329254bd2aab53d9e14c2commit | diff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:
Unnamed repository; edit this file 'description' to name the repository.