]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Wed, 7 Mar 2012 15:05:32 +0000 (10:05 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Wed, 7 Mar 2012 15:05:32 +0000 (10:05 -0500)
commit62fffdb018d7755e62b9bf897f3f6e68f42f3e6e
tree965444c7def7e3cace18f2a2bbac0dcee9442c3d
parentedfa7dbac2ff8ed054fce90cba40efcca6c85529
parentdd2ff7c796302648992835940600c18fd200c388
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  fix in navbar

* master: