From: rabuzarus <trebor@central-unit>
Date: Wed, 3 Aug 2016 10:53:38 +0000 (+0200)
Subject: Merge develop into 0308-Notifications-restructure
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ae905cbd1b67b2aeae33a64302368d285f63732d;p=friendica.git

Merge develop into 0308-Notifications-restructure

Conflicts:
	mod/notifications.php
---

ae905cbd1b67b2aeae33a64302368d285f63732d
diff --cc .gitignore
index b300f579e2,b300f579e2..77151060d2
--- a/.gitignore
+++ b/.gitignore
@@@ -42,3 -42,3 +42,16 @@@ nbprojec
  
  #ignore local folder
  /local/
++
++#other stuff
++.directory
++.gitignore
++
++/view/theme/Friendiboot
++/view/theme/Viereinhalb
++/view/theme/blog
++/view/theme/boheme
++/view/theme/clean
++/view/theme/suckerberg
++
++/addon/frio_hovercard