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:
This commit is contained in:
parent
c95deb4839
commit
ebccf13c4c