]> git.mxchange.org Git - friendica.git/commit
Merge develop-new into event-attendance-new
authorrabuzarus <trebor@central-unit>
Sun, 11 Oct 2015 17:39:55 +0000 (19:39 +0200)
committerrabuzarus <trebor@central-unit>
Sun, 11 Oct 2015 17:39:55 +0000 (19:39 +0200)
commit649578ae333e70280f8100b36f7d9e95cf27b64a
treeb9e81048c4a3ee5cd91493d2736a666ec2a7e078
parentdb7dca3d5f7416cfb5378bbfa10cf87924108a0e
parent78b8a081f38dbc41a8a0fc20c29909cef97faca0
Merge develop-new into event-attendance-new

Conflicts:
include/conversation.php
boot.php
include/conversation.php
include/features.php
include/items.php
mod/network.php
mod/photos.php
object/Item.php
view/theme/vier/style.css