Merge branch 'master' of git://github.com/friendica/friendica

diff --git a/include/security.php b/include/security.php
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/util/run_xgettext.sh b/util/run_xgettext.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/view/theme/diabook/ch_directory_item.tpl b/view/theme/diabook/ch_directory_item.tpl
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/contact_template.tpl b/view/theme/diabook/contact_template.tpl
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/diabook-aerith/ch_directory_item.tpl b/view/theme/diabook/diabook-aerith/ch_directory_item.tpl
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/diabook-aerith/directory_item.tpl b/view/theme/diabook/diabook-aerith/directory_item.tpl
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/diabook-aerith/group_side.tpl b/view/theme/diabook/diabook-aerith/group_side.tpl
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/diabook-aerith/icons/block.png b/view/theme/diabook/diabook-aerith/icons/block.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/diabook-blue/ch_directory_item.tpl b/view/theme/diabook/diabook-blue/ch_directory_item.tpl
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/diabook-blue/directory_item.tpl b/view/theme/diabook/diabook-blue/directory_item.tpl
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/diabook-blue/group_side.tpl b/view/theme/diabook/diabook-blue/group_side.tpl
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/diabook-blue/icons/block.png b/view/theme/diabook/diabook-blue/icons/block.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/diabook-dark/ch_directory_item.tpl b/view/theme/diabook/diabook-dark/ch_directory_item.tpl
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/diabook-dark/directory_item.tpl b/view/theme/diabook/diabook-dark/directory_item.tpl
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/diabook-dark/group_side.tpl b/view/theme/diabook/diabook-dark/group_side.tpl
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/diabook-dark/icons/block.png b/view/theme/diabook/diabook-dark/icons/block.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/diabook-green/ch_directory_item.tpl b/view/theme/diabook/diabook-green/ch_directory_item.tpl
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/diabook-green/directory_item.tpl b/view/theme/diabook/diabook-green/directory_item.tpl
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/diabook-green/group_side.tpl b/view/theme/diabook/diabook-green/group_side.tpl
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/diabook-green/icons/block.png b/view/theme/diabook/diabook-green/icons/block.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/diabook-green/icons/notifications3.png b/view/theme/diabook/diabook-green/icons/notifications3.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/diabook-green/icons/notify3.png b/view/theme/diabook/diabook-green/icons/notify3.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/diabook-pink/ch_directory_item.tpl b/view/theme/diabook/diabook-pink/ch_directory_item.tpl
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/diabook-pink/directory_item.tpl b/view/theme/diabook/diabook-pink/directory_item.tpl
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/diabook-pink/group_side.tpl b/view/theme/diabook/diabook-pink/group_side.tpl
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/diabook-pink/icons/block.png b/view/theme/diabook/diabook-pink/icons/block.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/diabook-pink/icons/notifications3.png b/view/theme/diabook/diabook-pink/icons/notifications3.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/diabook-pink/icons/notify3.png b/view/theme/diabook/diabook-pink/icons/notify3.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/diabook-red/ch_directory_item.tpl b/view/theme/diabook/diabook-red/ch_directory_item.tpl
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/diabook-red/directory_item.tpl b/view/theme/diabook/diabook-red/directory_item.tpl
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/diabook-red/group_side.tpl b/view/theme/diabook/diabook-red/group_side.tpl
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/diabook-red/icons/block.png b/view/theme/diabook/diabook-red/icons/block.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/directory_item.tpl b/view/theme/diabook/directory_item.tpl
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/group_side.tpl b/view/theme/diabook/group_side.tpl
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/icons/attach.png b/view/theme/diabook/icons/attach.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/icons/audio.png b/view/theme/diabook/icons/audio.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/icons/block.png b/view/theme/diabook/icons/block.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/icons/camera.png b/view/theme/diabook/icons/camera.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/icons/close_box.png b/view/theme/diabook/icons/close_box.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/icons/contacts2.png b/view/theme/diabook/icons/contacts2.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/icons/drop.png b/view/theme/diabook/icons/drop.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/icons/expand.png b/view/theme/diabook/icons/expand.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/icons/file_as.png b/view/theme/diabook/icons/file_as.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/icons/link.png b/view/theme/diabook/icons/link.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/icons/lock.png b/view/theme/diabook/icons/lock.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/icons/lupe.png b/view/theme/diabook/icons/lupe.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/icons/next.png b/view/theme/diabook/icons/next.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/icons/notifications3.png b/view/theme/diabook/icons/notifications3.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/icons/notify.png b/view/theme/diabook/icons/notify.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/icons/notify3.png b/view/theme/diabook/icons/notify3.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/icons/pencil.png b/view/theme/diabook/icons/pencil.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/icons/prev.png b/view/theme/diabook/icons/prev.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/icons/recycle.png b/view/theme/diabook/icons/recycle.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/icons/remote.png b/view/theme/diabook/icons/remote.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/icons/scroll_top.png b/view/theme/diabook/icons/scroll_top.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/icons/star.png b/view/theme/diabook/icons/star.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/icons/starred.png b/view/theme/diabook/icons/starred.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/icons/tagged.png b/view/theme/diabook/icons/tagged.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/icons/unlock.png b/view/theme/diabook/icons/unlock.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/icons/unstarred.png b/view/theme/diabook/icons/unstarred.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/icons/video.png b/view/theme/diabook/icons/video.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/icons/weblink.png b/view/theme/diabook/icons/weblink.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/mail_conv.tpl b/view/theme/diabook/mail_conv.tpl
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/search_item.tpl b/view/theme/diabook/search_item.tpl
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
old mode 100755 (executable)
new mode 100644 (file)