aboutsummaryrefslogtreecommitdiff
path: root/views/default/admin/settings
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2012-08-02 21:44:44 +0200
committerSem <sembrestels@riseup.net>2012-08-02 21:44:44 +0200
commitdad0209bbd7994b623bc0126e3e37b1f521d2977 (patch)
tree1e954b32439cbfc2acbbd63ed62dc372a260f37e /views/default/admin/settings
parentfa81c487488064f684649272a6579079d3a88e2c (diff)
parent28b1669c4b1afaed7429da2cc9580340dcb13b6e (diff)
downloadelgg-dad0209bbd7994b623bc0126e3e37b1f521d2977.tar.gz
elgg-dad0209bbd7994b623bc0126e3e37b1f521d2977.tar.bz2
Merge branch 'jquery-uploader' of git://github.com/sembrestels/Tidypics
Conflicts: start.php views/default/photos/css.php
Diffstat (limited to 'views/default/admin/settings')
0 files changed, 0 insertions, 0 deletions