aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/diabook-aerith
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-04-04 23:32:16 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-04-04 23:32:16 -0400
commitafe7f09b278bca546f606a6ce54707a853cddf47 (patch)
treead54ff6a49e503a0218a301ef8e362fb6e08c6ea /view/theme/diabook-aerith
parentc0a18bc2fad021db026141b732b3e9a1e0ce1d71 (diff)
parentd509a463452585bcbb9fccd07857871ca5c8b063 (diff)
downloadvolse-hubzilla-afe7f09b278bca546f606a6ce54707a853cddf47.tar.gz
volse-hubzilla-afe7f09b278bca546f606a6ce54707a853cddf47.tar.bz2
volse-hubzilla-afe7f09b278bca546f606a6ce54707a853cddf47.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: correct some filer dialog weirdness caused by introduction of categories move alert box away from nav links log disabled requests fix config storage of booleans * master:
Diffstat (limited to 'view/theme/diabook-aerith')
0 files changed, 0 insertions, 0 deletions