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

Conflicts: include/config.php update.php
2012-04-05 13:39:15 +02:00 · 2012-04-05 13:39:15 +02:00 · 355c42cb30
commit 355c42cb30
parent cbf4544887 9b6e91086b
1809 changed files with 48790 additions and 7152 deletions
--- a/library/fancybox/blank.gif
+++ b/library/fancybox/blank.gif
--- a/library/fancybox/fancy_close.png
+++ b/library/fancybox/fancy_close.png
--- a/library/fancybox/fancy_loading.png
+++ b/library/fancybox/fancy_loading.png
--- a/library/fancybox/fancy_nav_left.png
+++ b/library/fancybox/fancy_nav_left.png
--- a/library/fancybox/fancy_nav_right.png
+++ b/library/fancybox/fancy_nav_right.png
--- a/library/fancybox/fancy_shadow_e.png
+++ b/library/fancybox/fancy_shadow_e.png
--- a/library/fancybox/fancy_shadow_n.png
+++ b/library/fancybox/fancy_shadow_n.png
--- a/library/fancybox/fancy_shadow_ne.png
+++ b/library/fancybox/fancy_shadow_ne.png
--- a/library/fancybox/fancy_shadow_nw.png
+++ b/library/fancybox/fancy_shadow_nw.png
--- a/library/fancybox/fancy_shadow_s.png
+++ b/library/fancybox/fancy_shadow_s.png
--- a/library/fancybox/fancy_shadow_se.png
+++ b/library/fancybox/fancy_shadow_se.png
--- a/library/fancybox/fancy_shadow_sw.png
+++ b/library/fancybox/fancy_shadow_sw.png
--- a/library/fancybox/fancy_shadow_w.png
+++ b/library/fancybox/fancy_shadow_w.png
--- a/library/fancybox/fancy_title_left.png
+++ b/library/fancybox/fancy_title_left.png
--- a/library/fancybox/fancy_title_main.png
+++ b/library/fancybox/fancy_title_main.png
--- a/library/fancybox/fancy_title_over.png
+++ b/library/fancybox/fancy_title_over.png
--- a/library/fancybox/fancy_title_right.png
+++ b/library/fancybox/fancy_title_right.png
--- a/library/fancybox/fancybox-x.png
+++ b/library/fancybox/fancybox-x.png
--- a/library/fancybox/fancybox-y.png
+++ b/library/fancybox/fancybox-y.png
--- a/library/fancybox/fancybox.png
+++ b/library/fancybox/fancybox.png
--- a/library/fancybox/jquery.easing-1.3.pack.js
+++ b/library/fancybox/jquery.easing-1.3.pack.js
--- a/library/fancybox/jquery.fancybox-1.3.4.css
+++ b/library/fancybox/jquery.fancybox-1.3.4.css
--- a/library/fancybox/jquery.fancybox-1.3.4.js
+++ b/library/fancybox/jquery.fancybox-1.3.4.js
--- a/library/fancybox/jquery.fancybox-1.3.4.pack.js
+++ b/library/fancybox/jquery.fancybox-1.3.4.pack.js
--- a/library/fancybox/jquery.mousewheel-3.0.4.pack.js
+++ b/library/fancybox/jquery.mousewheel-3.0.4.pack.js