]> git.mxchange.org Git - friendica.git/commitdiff
Merge develop
authorAlexandre Alapetite <alexandre@alapetite.fr>
Fri, 14 Apr 2017 23:03:21 +0000 (01:03 +0200)
committerAlexandre Alapetite <alexandre@alapetite.fr>
Fri, 14 Apr 2017 23:03:21 +0000 (01:03 +0200)
1  2 
include/acl_selectors.php
include/photos.php

Simple merge
Simple merge