]> git.mxchange.org Git - friendica.git/commit
Merge develop into 0308-Notifications-restructure
authorrabuzarus <trebor@central-unit>
Wed, 3 Aug 2016 10:53:38 +0000 (12:53 +0200)
committerrabuzarus <trebor@central-unit>
Wed, 3 Aug 2016 10:53:38 +0000 (12:53 +0200)
commitae905cbd1b67b2aeae33a64302368d285f63732d
tree91f64be4cf9dc05dd96be749397bed0d36084107
parentce3188d5c6a8dc2e4ebf188faef235a1b3b5c5b1
parent626340146b9dd9499cf6d74aaf3badefc56b5ea7
Merge develop into 0308-Notifications-restructure

Conflicts:
mod/notifications.php
.gitignore