diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-11 20:33:10 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-11 20:33:10 -0400 |
| commit | de70b2f30f8cf102a91c23dcbd50754ae7b27d81 (patch) | |
| tree | 77d922093d35d329b513f84696b3a87a9403a098 /view/settings.tpl | |
| parent | 6e5f8376090be020b81f8793a2bed65ba9a879a5 (diff) | |
| parent | 1401f763eca776052e97c4d270b33f8c4e1c6e4c (diff) | |
| download | volse-hubzilla-de70b2f30f8cf102a91c23dcbd50754ae7b27d81.tar.gz volse-hubzilla-de70b2f30f8cf102a91c23dcbd50754ae7b27d81.tar.bz2 volse-hubzilla-de70b2f30f8cf102a91c23dcbd50754ae7b27d81.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
community meta tag renamed from "ika"
* master:
Diffstat (limited to 'view/settings.tpl')
0 files changed, 0 insertions, 0 deletions