summaryrefslogtreecommitdiff
path: root/templates/admin
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2010-03-03 06:55:54 -0600
committerDan McGee <dan@archlinux.org>2010-03-03 06:55:54 -0600
commit83b7b94c0b062b0c209ea47de9180f28db6dbb81 (patch)
tree10996dee5eadc35603a59bfcd8a2c7d55b3d2de1 /templates/admin
parent558fad8bee8b456eef23532ef2c15f897414be86 (diff)
parentf7e15ed728d7c5e3470f6127cc21e64baefcbfb2 (diff)
Merge branch 'master' into cdn-jquery
Conflicts: templates/todolists/view.html
Diffstat (limited to 'templates/admin')
0 files changed, 0 insertions, 0 deletions