diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-29 12:30:13 -0400 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-29 12:30:13 -0400 |
commit | e7b920c273efd8c6a70b90f701bd14f5c632d38f (patch) | |
tree | 1b1aeb8b50a56774dc66ad68765f3462b91b5403 /.gitmodules | |
parent | f2e2632810ad3ac465edcf4cf80e1dc89e995c82 (diff) | |
parent | e935b3a2253e2c1078ebecb7b9784029c94fb344 (diff) | |
download | volse-hubzilla-e7b920c273efd8c6a70b90f701bd14f5c632d38f.tar.gz volse-hubzilla-e7b920c273efd8c6a70b90f701bd14f5c632d38f.tar.bz2 volse-hubzilla-e7b920c273efd8c6a70b90f701bd14f5c632d38f.zip |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
theme file_as combobox for 2.0
css fixes in diabook-derivates
quattro: style pm pages
message: remove tabs, move new message link to aside, all message with gmail-style
quattro: tpl for "file as"
* master:
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions