]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Tue, 6 Mar 2012 23:57:52 +0000 (18:57 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Tue, 6 Mar 2012 23:57:52 +0000 (18:57 -0500)
commitc4c98a998827fb0ec49d5b40d3e4439aa9146e24
tree4fae326bc32c1a444cd5e956ae9dd518f2791b7a
parent668892b7a38547210b8162f9988844c99474b051
parent05a52b2660a879a97d511b180e26fe12310d0464
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  fix in navbar

* master: