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

Conflicts:
	include/config.php
	update.php

25 files changed, 0 insertions, 0 deletions

diff --git a/library/fancybox/blank.gif b/library/fancybox/blank.gif
index 35d42e808..35d42e808 100755..100644
--- a/library/fancybox/blank.gif
+++ b/library/fancybox/blank.gif
diff --git a/library/fancybox/fancy_close.png b/library/fancybox/fancy_close.png
index 07035307a..07035307a 100755..100644
--- a/library/fancybox/fancy_close.png
+++ b/library/fancybox/fancy_close.png
diff --git a/library/fancybox/fancy_loading.png b/library/fancybox/fancy_loading.png
index 250301796..250301796 100755..100644
--- a/library/fancybox/fancy_loading.png
+++ b/library/fancybox/fancy_loading.png
diff --git a/library/fancybox/fancy_nav_left.png b/library/fancybox/fancy_nav_left.png
index ebaa6a4fd..ebaa6a4fd 100755..100644
--- a/library/fancybox/fancy_nav_left.png
+++ b/library/fancybox/fancy_nav_left.png
diff --git a/library/fancybox/fancy_nav_right.png b/library/fancybox/fancy_nav_right.png
index 873294e96..873294e96 100755..100644
--- a/library/fancybox/fancy_nav_right.png
+++ b/library/fancybox/fancy_nav_right.png
diff --git a/library/fancybox/fancy_shadow_e.png b/library/fancybox/fancy_shadow_e.png
index 2eda08936..2eda08936 100755..100644
--- a/library/fancybox/fancy_shadow_e.png
+++ b/library/fancybox/fancy_shadow_e.png
diff --git a/library/fancybox/fancy_shadow_n.png b/library/fancybox/fancy_shadow_n.png
index 69aa10e23..69aa10e23 100755..100644
--- a/library/fancybox/fancy_shadow_n.png
+++ b/library/fancybox/fancy_shadow_n.png
diff --git a/library/fancybox/fancy_shadow_ne.png b/library/fancybox/fancy_shadow_ne.png
index 79f6980a3..79f6980a3 100755..100644
--- a/library/fancybox/fancy_shadow_ne.png
+++ b/library/fancybox/fancy_shadow_ne.png
diff --git a/library/fancybox/fancy_shadow_nw.png b/library/fancybox/fancy_shadow_nw.png
index 7182cd938..7182cd938 100755..100644
--- a/library/fancybox/fancy_shadow_nw.png
+++ b/library/fancybox/fancy_shadow_nw.png
diff --git a/library/fancybox/fancy_shadow_s.png b/library/fancybox/fancy_shadow_s.png
index d8858bfb7..d8858bfb7 100755..100644
--- a/library/fancybox/fancy_shadow_s.png
+++ b/library/fancybox/fancy_shadow_s.png
diff --git a/library/fancybox/fancy_shadow_se.png b/library/fancybox/fancy_shadow_se.png
index 541e3ffd3..541e3ffd3 100755..100644
--- a/library/fancybox/fancy_shadow_se.png
+++ b/library/fancybox/fancy_shadow_se.png
diff --git a/library/fancybox/fancy_shadow_sw.png b/library/fancybox/fancy_shadow_sw.png
index b451689fa..b451689fa 100755..100644
--- a/library/fancybox/fancy_shadow_sw.png
+++ b/library/fancybox/fancy_shadow_sw.png
diff --git a/library/fancybox/fancy_shadow_w.png b/library/fancybox/fancy_shadow_w.png
index 8a4e4a887..8a4e4a887 100755..100644
--- a/library/fancybox/fancy_shadow_w.png
+++ b/library/fancybox/fancy_shadow_w.png
diff --git a/library/fancybox/fancy_title_left.png b/library/fancybox/fancy_title_left.png
index 6049223d1..6049223d1 100755..100644
--- a/library/fancybox/fancy_title_left.png
+++ b/library/fancybox/fancy_title_left.png
diff --git a/library/fancybox/fancy_title_main.png b/library/fancybox/fancy_title_main.png
index 8044271f2..8044271f2 100755..100644
--- a/library/fancybox/fancy_title_main.png
+++ b/library/fancybox/fancy_title_main.png
diff --git a/library/fancybox/fancy_title_over.png b/library/fancybox/fancy_title_over.png
index d9f458f4b..d9f458f4b 100755..100644
--- a/library/fancybox/fancy_title_over.png
+++ b/library/fancybox/fancy_title_over.png
diff --git a/library/fancybox/fancy_title_right.png b/library/fancybox/fancy_title_right.png
index e36d9db2a..e36d9db2a 100755..100644
--- a/library/fancybox/fancy_title_right.png
+++ b/library/fancybox/fancy_title_right.png
diff --git a/library/fancybox/fancybox-x.png b/library/fancybox/fancybox-x.png
index c2130f869..c2130f869 100755..100644
--- a/library/fancybox/fancybox-x.png
+++ b/library/fancybox/fancybox-x.png
diff --git a/library/fancybox/fancybox-y.png b/library/fancybox/fancybox-y.png
index 7ef399b99..7ef399b99 100755..100644
--- a/library/fancybox/fancybox-y.png
+++ b/library/fancybox/fancybox-y.png
diff --git a/library/fancybox/fancybox.png b/library/fancybox/fancybox.png
index 65e14f68f..65e14f68f 100755..100644
--- a/library/fancybox/fancybox.png
+++ b/library/fancybox/fancybox.png
diff --git a/library/fancybox/jquery.easing-1.3.pack.js b/library/fancybox/jquery.easing-1.3.pack.js
index 9028179e7..9028179e7 100755..100644
--- a/library/fancybox/jquery.easing-1.3.pack.js
+++ b/library/fancybox/jquery.easing-1.3.pack.js
diff --git a/library/fancybox/jquery.fancybox-1.3.4.css b/library/fancybox/jquery.fancybox-1.3.4.css
index 6f53d8f4a..6f53d8f4a 100755..100644
--- a/library/fancybox/jquery.fancybox-1.3.4.css
+++ b/library/fancybox/jquery.fancybox-1.3.4.css
diff --git a/library/fancybox/jquery.fancybox-1.3.4.js b/library/fancybox/jquery.fancybox-1.3.4.js
index be7727537..be7727537 100755..100644
--- a/library/fancybox/jquery.fancybox-1.3.4.js
+++ b/library/fancybox/jquery.fancybox-1.3.4.js
diff --git a/library/fancybox/jquery.fancybox-1.3.4.pack.js b/library/fancybox/jquery.fancybox-1.3.4.pack.js
index 1373ed083..1373ed083 100755..100644
--- a/library/fancybox/jquery.fancybox-1.3.4.pack.js
+++ b/library/fancybox/jquery.fancybox-1.3.4.pack.js
diff --git a/library/fancybox/jquery.mousewheel-3.0.4.pack.js b/library/fancybox/jquery.mousewheel-3.0.4.pack.js
index cb66588e2..cb66588e2 100755..100644
--- a/library/fancybox/jquery.mousewheel-3.0.4.pack.js
+++ b/library/fancybox/jquery.mousewheel-3.0.4.pack.js