]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Mon, 13 Jan 2014 18:59:34 +0000 (19:59 +0100)
committerMichael Vogel <icarus@dabo.de>
Mon, 13 Jan 2014 18:59:34 +0000 (19:59 +0100)
commit17236b18011f6c2fa7df7d1433dd815d4438baf8
treef9a729aaee63ad5dd7c6bab2fda62cccc7347950
parent43e916e81aea513bf388adec8399a30cd3ccbbf9
parent7c8e2e46d82c9d607a7214de158e29932d8ab6cf
Merge remote-tracking branch 'upstream/master'

Conflicts:
include/acl_selectors.php
boot.php
include/acl_selectors.php