diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-27 21:00:56 -0400 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-27 21:00:56 -0400 |
commit | b618715fc676fce71303816c0d49d8aad8beb0b6 (patch) | |
tree | f23edf82793ede551df581a36f8bc2370770c092 /view/theme/diabook/icons/srch_bg.gif | |
parent | c3f70a9e56151b8594b3485cc8b12e4d26ac6773 (diff) | |
download | volse-hubzilla-b618715fc676fce71303816c0d49d8aad8beb0b6.tar.gz volse-hubzilla-b618715fc676fce71303816c0d49d8aad8beb0b6.tar.bz2 volse-hubzilla-b618715fc676fce71303816c0d49d8aad8beb0b6.zip |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
string update
implement contact archival
archive contact flag
pass zrl to dfrn_request as fallback
rev update
another attempt to fix lower tab behaviour on small screens, community back in tab area
* master:
Diffstat (limited to 'view/theme/diabook/icons/srch_bg.gif')
0 files changed, 0 insertions, 0 deletions