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

Conflicts:
	include/config.php
	update.php

61 files changed, 0 insertions, 0 deletions

diff --git a/view/theme/diabook-aerith/icons/StatusNet.png b/view/theme/diabook-aerith/icons/StatusNet.png
new file mode 100644
index 000000000..398bca716
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/StatusNet.png
diff --git a/view/theme/diabook-aerith/icons/attach.png b/view/theme/diabook-aerith/icons/attach.png
new file mode 100644
index 000000000..1958041cf
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/attach.png
diff --git a/view/theme/diabook-aerith/icons/audio.png b/view/theme/diabook-aerith/icons/audio.png
new file mode 100644
index 000000000..8d779a409
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/audio.png
diff --git a/view/theme/diabook-aerith/icons/bluebug.png b/view/theme/diabook-aerith/icons/bluebug.png
new file mode 100644
index 000000000..3979e7d8e
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/bluebug.png
diff --git a/view/theme/diabook-aerith/icons/camera.png b/view/theme/diabook-aerith/icons/camera.png
new file mode 100644
index 000000000..a5c7f1236
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/camera.png
diff --git a/view/theme/diabook-aerith/icons/close_box.png b/view/theme/diabook-aerith/icons/close_box.png
new file mode 100644
index 000000000..28e2675b8
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/close_box.png
diff --git a/view/theme/diabook-aerith/icons/com_side.png b/view/theme/diabook-aerith/icons/com_side.png
new file mode 100644
index 000000000..bc5969ef1
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/com_side.png
diff --git a/view/theme/diabook-aerith/icons/community.png b/view/theme/diabook-aerith/icons/community.png
new file mode 100644
index 000000000..7c91e8b75
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/community.png
diff --git a/view/theme/diabook-aerith/icons/contacts.png b/view/theme/diabook-aerith/icons/contacts.png
new file mode 100644
index 000000000..cd0e289a7
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/contacts.png
diff --git a/view/theme/diabook-aerith/icons/contacts2.png b/view/theme/diabook-aerith/icons/contacts2.png
new file mode 100644
index 000000000..cd0e289a7
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/contacts2.png
diff --git a/view/theme/diabook-aerith/icons/dislike.png b/view/theme/diabook-aerith/icons/dislike.png
new file mode 100644
index 000000000..23de426c5
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/dislike.png
diff --git a/view/theme/diabook-aerith/icons/drop.png b/view/theme/diabook-aerith/icons/drop.png
new file mode 100644
index 000000000..2abb82ef2
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/drop.png
diff --git a/view/theme/diabook-aerith/icons/email.png b/view/theme/diabook-aerith/icons/email.png
new file mode 100644
index 000000000..240cef2c3
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/email.png
diff --git a/view/theme/diabook-aerith/icons/events.png b/view/theme/diabook-aerith/icons/events.png
new file mode 100644
index 000000000..4a0b3f3f1
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/events.png
diff --git a/view/theme/diabook-aerith/icons/facebook.png b/view/theme/diabook-aerith/icons/facebook.png
new file mode 100644
index 000000000..3e5dd39c3
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/facebook.png
diff --git a/view/theme/diabook-aerith/icons/file_as.png b/view/theme/diabook-aerith/icons/file_as.png
new file mode 100644
index 000000000..16713fa53
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/file_as.png
diff --git a/view/theme/diabook-aerith/icons/ftdevs.gif b/view/theme/diabook-aerith/icons/ftdevs.gif
new file mode 100644
index 000000000..e0fc25743
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/ftdevs.gif
diff --git a/view/theme/diabook-aerith/icons/globe.png b/view/theme/diabook-aerith/icons/globe.png
new file mode 100644
index 000000000..6bb9bc09d
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/globe.png
diff --git a/view/theme/diabook-aerith/icons/home.png b/view/theme/diabook-aerith/icons/home.png
new file mode 100644
index 000000000..be47a48fc
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/home.png
diff --git a/view/theme/diabook-aerith/icons/language.png b/view/theme/diabook-aerith/icons/language.png
new file mode 100644
index 000000000..8029c0155
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/language.png
diff --git a/view/theme/diabook-aerith/icons/like.png b/view/theme/diabook-aerith/icons/like.png
new file mode 100644
index 000000000..b65edccc0
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/like.png
diff --git a/view/theme/diabook-aerith/icons/link.png b/view/theme/diabook-aerith/icons/link.png
new file mode 100644
index 000000000..0ef666a67
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/link.png
diff --git a/view/theme/diabook-aerith/icons/livejournal.png b/view/theme/diabook-aerith/icons/livejournal.png
new file mode 100644
index 000000000..6d27d265e
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/livejournal.png
diff --git a/view/theme/diabook-aerith/icons/lock.png b/view/theme/diabook-aerith/icons/lock.png
new file mode 100644
index 000000000..7e34bf279
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/lock.png
diff --git a/view/theme/diabook-aerith/icons/lupe.png b/view/theme/diabook-aerith/icons/lupe.png
new file mode 100644
index 000000000..f8b228347
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/lupe.png
diff --git a/view/theme/diabook-aerith/icons/mess_side.png b/view/theme/diabook-aerith/icons/mess_side.png
new file mode 100644
index 000000000..49ef896bc
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/mess_side.png
diff --git a/view/theme/diabook-aerith/icons/messages.png b/view/theme/diabook-aerith/icons/messages.png
new file mode 100644
index 000000000..e2bf7d24d
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/messages.png
diff --git a/view/theme/diabook-aerith/icons/messages2.png b/view/theme/diabook-aerith/icons/messages2.png
new file mode 100644
index 000000000..e2bf7d24d
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/messages2.png
diff --git a/view/theme/diabook-aerith/icons/next.png b/view/theme/diabook-aerith/icons/next.png
new file mode 100644
index 000000000..7b5e25b90
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/next.png
diff --git a/view/theme/diabook-aerith/icons/notes.png b/view/theme/diabook-aerith/icons/notes.png
new file mode 100644
index 000000000..7d4afca90
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/notes.png
diff --git a/view/theme/diabook-aerith/icons/notifications.png b/view/theme/diabook-aerith/icons/notifications.png
new file mode 100644
index 000000000..2b4fbb818
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/notifications.png
diff --git a/view/theme/diabook-aerith/icons/notify.png b/view/theme/diabook-aerith/icons/notify.png
new file mode 100644
index 000000000..9765bfd53
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/notify.png
diff --git a/view/theme/diabook-aerith/icons/notify2.png b/view/theme/diabook-aerith/icons/notify2.png
new file mode 100644
index 000000000..9765bfd53
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/notify2.png
diff --git a/view/theme/diabook-aerith/icons/pencil.png b/view/theme/diabook-aerith/icons/pencil.png
new file mode 100644
index 000000000..772e49b17
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/pencil.png
diff --git a/view/theme/diabook-aerith/icons/pencil2.png b/view/theme/diabook-aerith/icons/pencil2.png
new file mode 100644
index 000000000..3b47d1864
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/pencil2.png
diff --git a/view/theme/diabook-aerith/icons/photo-menu.jpg b/view/theme/diabook-aerith/icons/photo-menu.jpg
new file mode 100644
index 000000000..fde5eb535
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/photo-menu.jpg
diff --git a/view/theme/diabook-aerith/icons/posterous.png b/view/theme/diabook-aerith/icons/posterous.png
new file mode 100644
index 000000000..c8e86078e
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/posterous.png
diff --git a/view/theme/diabook-aerith/icons/prev.png b/view/theme/diabook-aerith/icons/prev.png
new file mode 100644
index 000000000..55c1464ba
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/prev.png
diff --git a/view/theme/diabook-aerith/icons/pscontacts.png b/view/theme/diabook-aerith/icons/pscontacts.png
new file mode 100644
index 000000000..acf857f32
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/pscontacts.png
diff --git a/view/theme/diabook-aerith/icons/pubgroups.png b/view/theme/diabook-aerith/icons/pubgroups.png
new file mode 100644
index 000000000..6d9539610
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/pubgroups.png
diff --git a/view/theme/diabook-aerith/icons/recycle.png b/view/theme/diabook-aerith/icons/recycle.png
new file mode 100644
index 000000000..c3b8d2bf4
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/recycle.png
diff --git a/view/theme/diabook-aerith/icons/remote.png b/view/theme/diabook-aerith/icons/remote.png
new file mode 100644
index 000000000..a560cc55e
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/remote.png
diff --git a/view/theme/diabook-aerith/icons/scroll_top.png b/view/theme/diabook-aerith/icons/scroll_top.png
new file mode 100644
index 000000000..0e7f7ae6a
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/scroll_top.png
diff --git a/view/theme/diabook-aerith/icons/selected.png b/view/theme/diabook-aerith/icons/selected.png
new file mode 100644
index 000000000..2a30ae252
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/selected.png
diff --git a/view/theme/diabook-aerith/icons/srch_bg.gif b/view/theme/diabook-aerith/icons/srch_bg.gif
new file mode 100644
index 000000000..6a523ba8f
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/srch_bg.gif
diff --git a/view/theme/diabook-aerith/icons/srch_l.gif b/view/theme/diabook-aerith/icons/srch_l.gif
new file mode 100644
index 000000000..6d95bf35d
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/srch_l.gif
diff --git a/view/theme/diabook-aerith/icons/srch_r.gif b/view/theme/diabook-aerith/icons/srch_r.gif
new file mode 100644
index 000000000..89833a316
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/srch_r.gif
diff --git a/view/theme/diabook-aerith/icons/srch_r_f2.gif b/view/theme/diabook-aerith/icons/srch_r_f2.gif
new file mode 100644
index 000000000..6df457bed
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/srch_r_f2.gif
diff --git a/view/theme/diabook-aerith/icons/star.png b/view/theme/diabook-aerith/icons/star.png
new file mode 100644
index 000000000..0b00cb189
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/star.png
diff --git a/view/theme/diabook-aerith/icons/star_dummy.png b/view/theme/diabook-aerith/icons/star_dummy.png
new file mode 100644
index 000000000..ce11f30d4
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/star_dummy.png
diff --git a/view/theme/diabook-aerith/icons/starred.png b/view/theme/diabook-aerith/icons/starred.png
new file mode 100644
index 000000000..2b82dfca3
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/starred.png
diff --git a/view/theme/diabook-aerith/icons/tagged.png b/view/theme/diabook-aerith/icons/tagged.png
new file mode 100644
index 000000000..144649ef8
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/tagged.png
diff --git a/view/theme/diabook-aerith/icons/toogle_off.png b/view/theme/diabook-aerith/icons/toogle_off.png
new file mode 100644
index 000000000..0fcce4d5a
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/toogle_off.png
diff --git a/view/theme/diabook-aerith/icons/toogle_on.png b/view/theme/diabook-aerith/icons/toogle_on.png
new file mode 100644
index 000000000..79ce07f0e
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/toogle_on.png
diff --git a/view/theme/diabook-aerith/icons/tumblr.png b/view/theme/diabook-aerith/icons/tumblr.png
new file mode 100644
index 000000000..1dc7fa072
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/tumblr.png
diff --git a/view/theme/diabook-aerith/icons/twitter.png b/view/theme/diabook-aerith/icons/twitter.png
new file mode 100644
index 000000000..b7a687b9f
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/twitter.png
diff --git a/view/theme/diabook-aerith/icons/unlock.png b/view/theme/diabook-aerith/icons/unlock.png
new file mode 100644
index 000000000..a0cda0ae5
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/unlock.png
diff --git a/view/theme/diabook-aerith/icons/unstarred.png b/view/theme/diabook-aerith/icons/unstarred.png
new file mode 100644
index 000000000..ba3183f5c
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/unstarred.png
diff --git a/view/theme/diabook-aerith/icons/video.png b/view/theme/diabook-aerith/icons/video.png
new file mode 100644
index 000000000..a03d1d818
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/video.png
diff --git a/view/theme/diabook-aerith/icons/weblink.png b/view/theme/diabook-aerith/icons/weblink.png
new file mode 100644
index 000000000..216e78344
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/weblink.png
diff --git a/view/theme/diabook-aerith/icons/wordpress.png b/view/theme/diabook-aerith/icons/wordpress.png
new file mode 100644
index 000000000..f564c4300
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/wordpress.png