]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 638bbb2) | patch
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sun, 4 Mar 2012 17:19:43 +0000 (12:19 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Sun, 4 Mar 2012 17:19:43 +0000 (12:19 -0500)
commitd98ca8e127eca8cee1953012e0bda5f3fee16672
tree7686f4f3866e79e51fe225d3eaaa8033844679e1tree | snapshot
parent638bbb2171b6d1dcd68f0d46359441afb848561dcommit | diff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  revup

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