From: Simon L'nu <simon.lnu@gmail.com>
Date: Wed, 14 Mar 2012 15:02:14 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ebccf13c4c883e1438f4446d6aeba070ce6ee967;p=friendica.git

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:
---