]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Tue, 28 Feb 2012 21:43:08 +0000 (16:43 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Tue, 28 Feb 2012 21:43:08 +0000 (16:43 -0500)
commit21d1dc48a8e83e55c55d894f85b742ef667553d7
treed48c78c4ff3d59f06e4cf506ba46375f6f77e7d6
parent718c5ea23e642f8eb3fd91670e5b8faf705df55b
parent733f830be4b554c83361e877a5f1108767a815fc
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  fix url and network display

* master: