]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1d56224 1b8ac30)
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)
* remotes/upstream/master:
  move community_pages to right_aside, fixes in css
  improved the inivitations and added a bit of sales pitch.

* master:


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.