]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1772037) | patch
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Mon, 5 Mar 2012 18:17:40 +0000 (13:17 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Mon, 5 Mar 2012 18:17:40 +0000 (13:17 -0500)
commit7f894794e4ecc820a2430a7c4362d60f0de63020
tree8eba416a4e5b5b88114bb41aba1aeb3e94a05665tree | snapshot
parent1772037c989970380b90f46b49b78fc89042b89fcommit | diff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

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