aboutsummaryrefslogtreecommitdiffstats
path: root/view/admin_aside.tpl
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-03-08 10:46:40 -0500
committerSimon L'nu <simon.lnu@gmail.com>2012-03-08 10:46:40 -0500
commitbc3051e113245f518e40bb1196521c9fc4ab7bbc (patch)
tree8f1ef296d13b82a7e27a8eba183152292c885812 /view/admin_aside.tpl
parentd90c830332899629a6016f1767bb7dff7d0d56a9 (diff)
parent08b5ede5a18647655a0c89f0c40118e2259117be (diff)
downloadvolse-hubzilla-bc3051e113245f518e40bb1196521c9fc4ab7bbc.tar.gz
volse-hubzilla-bc3051e113245f518e40bb1196521c9fc4ab7bbc.tar.bz2
volse-hubzilla-bc3051e113245f518e40bb1196521c9fc4ab7bbc.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: add links to /profiles, add some icons to diabook/icons, fixes in css Update README reworked fix from unary for bug #323 (due to incorrect use of array_key_exists()) * master:
Diffstat (limited to 'view/admin_aside.tpl')
0 files changed, 0 insertions, 0 deletions