diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-25 03:18:21 -0400 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-25 03:18:21 -0400 |
commit | 84686a26986e4d57093e48523b444dcd4f17c392 (patch) | |
tree | 3d45d2fcf42e34412328f6878944bed9c0993662 /view/api_friends_xml.tpl | |
parent | 1d56224b08fe9781a050143f14c45fd518c5ca93 (diff) | |
parent | 1b8ac30fae55ff842d7f34fa2d9086d42cc421f1 (diff) | |
download | volse-hubzilla-84686a26986e4d57093e48523b444dcd4f17c392.tar.gz volse-hubzilla-84686a26986e4d57093e48523b444dcd4f17c392.tar.bz2 volse-hubzilla-84686a26986e4d57093e48523b444dcd4f17c392.zip |
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:
Diffstat (limited to 'view/api_friends_xml.tpl')
0 files changed, 0 insertions, 0 deletions