]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Wed, 14 Mar 2012 15:02:14 +0000 (11:02 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Wed, 14 Mar 2012 15:02:14 +0000 (11:02 -0400)
commitebccf13c4c883e1438f4446d6aeba070ce6ee967
treef9e7d080dd0e32d876cb07409b4f8dc1b550b10b
parentc95deb48398a23de68a3d438b5fffeaea3f3fa01
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  fix in nav
  add links to home, profile, photos, events, notes to aside in network-stream

* master: