]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sun, 25 Mar 2012 07:18:21 +0000 (03:18 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sun, 25 Mar 2012 07:18:21 +0000 (03:18 -0400)
commit84686a26986e4d57093e48523b444dcd4f17c392
tree3d45d2fcf42e34412328f6878944bed9c0993662
parent1d56224b08fe9781a050143f14c45fd518c5ca93
parent1b8ac30fae55ff842d7f34fa2d9086d42cc421f1
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  move community_pages to right_aside, fixes in css
  improved the inivitations and added a bit of sales pitch.

* master: