]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 62ea913) | patch
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Fri, 4 May 2012 21:43:04 +0000 (17:43 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Fri, 4 May 2012 21:43:04 +0000 (17:43 -0400)
commit250bf57e1e69670b956c1365dcb9ffa90800c05c
tree4e02064bfc1537a85a7b4ab202d73b6ff1034ebetree | snapshot
parent62ea9130feea694d733e6cbde9dec6c1b4a0ef51commit | diff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

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