]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1821369) | patch
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Tue, 6 Mar 2012 23:42:00 +0000 (18:42 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Tue, 6 Mar 2012 23:42:00 +0000 (18:42 -0500)
commit668892b7a38547210b8162f9988844c99474b051
tree23860d3717823e3dd47304b8ee8ab2b741097f7dtree | snapshot
parent18213692db5774573bf698216bfa543e8575c6c9commit | diff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

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