]> git.mxchange.org Git - friendica.git/commit
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)
commitf99bb958f61f17e81452f3f9c4d3472c3de8b37b
tree72cc678d5334c74a90e641b36206cde90e29a9a6
parent40e5436604db8fb6cfdf3d73938c2a58dd7b4eef
parent3da0436f0160e091e736d6dbdccd82cda9189798
Merge develop into 20170407_-_group_edit

Conflicts:
mod/group.php
view/theme/frio/css/style.css
view/theme/frio/templates/contact_template.tpl