aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/diabook-aerith/photo_view.tpl
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-04-07 03:10:09 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-04-07 03:10:09 -0400
commitbc69a957dc875b699240827cb4af2691f8a8fcd6 (patch)
tree28442b76b1c8fec40235445d62b01c182f770b5f /view/theme/diabook-aerith/photo_view.tpl
parent43d5876e8b35d53a0bef5248c5d63e5bc209dbbf (diff)
parentecabe1d505464577fdc3d3ff0090371c8ca0cf1e (diff)
downloadvolse-hubzilla-bc69a957dc875b699240827cb4af2691f8a8fcd6.tar.gz
volse-hubzilla-bc69a957dc875b699240827cb4af2691f8a8fcd6.tar.bz2
volse-hubzilla-bc69a957dc875b699240827cb4af2691f8a8fcd6.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: ignore removed plugins fix messed up config tables w/ duplicate entries small fixes for the German strings fix bad sql update revert config changes, we're getting duplicate keys new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator... profile-picture is now scaled right in firefox... fixed broken css on introductions-page in firefox... * master:
Diffstat (limited to 'view/theme/diabook-aerith/photo_view.tpl')
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/photo_view.tpl0
1 files changed, 0 insertions, 0 deletions
diff --git a/view/theme/diabook-aerith/photo_view.tpl b/view/theme/diabook-aerith/photo_view.tpl
index 511fc73ac..511fc73ac 100644..100755
--- a/view/theme/diabook-aerith/photo_view.tpl
+++ b/view/theme/diabook-aerith/photo_view.tpl