]> git.mxchange.org Git - friendica.git/commitdiff
Merge develop into 20170407_-_group_edit
authorrabuzarus <>
Fri, 21 Apr 2017 14:09:48 +0000 (16:09 +0200)
committerrabuzarus <>
Fri, 21 Apr 2017 14:09:48 +0000 (16:09 +0200)
Conflicts:
mod/group.php

1  2 
view/theme/frio/css/style.css
view/theme/frio/templates/contact_template.tpl

Simple merge