aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-05-05 20:08:19 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-05-05 20:08:19 -0400
commit0c4099966a5ac1f1ff5dc568a600aa57776fb752 (patch)
treef6c8a337eeae8ecc1848e319c9e5beb8c338d973 /mod
parent250bf57e1e69670b956c1365dcb9ffa90800c05c (diff)
parente1ab3a93cc450ca52c7651ecca8cad8334e5f1ce (diff)
downloadvolse-hubzilla-0c4099966a5ac1f1ff5dc568a600aa57776fb752.tar.gz
volse-hubzilla-0c4099966a5ac1f1ff5dc568a600aa57776fb752.tar.bz2
volse-hubzilla-0c4099966a5ac1f1ff5dc568a600aa57776fb752.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: diabook-theme: small fix diabook-theme: twitter-box-update at right_aside diabook-theme: can now set the twitter search term in theme-settings & small fixes consolidate item deletion so we can fix orphaned categories and file_as tags. DE: new email templates translated workaround to clean up orphaned filetags only show remove category to item owner Option to set theme width added. Minor layout changes * master:
Diffstat (limited to 'mod')
0 files changed, 0 insertions, 0 deletions