]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f3c1e2c) | patch
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sun, 4 Mar 2012 00:24:54 +0000 (19:24 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Sun, 4 Mar 2012 00:24:54 +0000 (19:24 -0500)
commiteae6418074d8c2addf85acf11e8f83165b847d04
tree8d8ff10c21a7490a13b7c472dc48269c7017df47tree | snapshot
parentf3c1e2c546a7c9b5c3d04796d37dce6ac5d039d3commit | diff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  tag fix
  fix
  navbar fix

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