]> git.mxchange.org Git - friendica.git/commit - view/theme/decaf-mobile/templates/settings.tpl
Merge branch 'develop' of https://github.com/gerhard6380/friendica into develop
authorroot <root@bk-hasecom.hasecom.local>
Tue, 24 Nov 2015 01:56:35 +0000 (02:56 +0100)
committerroot <root@bk-hasecom.hasecom.local>
Tue, 24 Nov 2015 01:56:35 +0000 (02:56 +0100)
commitc73d9611983b05cd1207d69c71a157c051b3f2e8
treeef91f54a55256a494cbceb2e48b03ebc69c95147
parent2c89a43286dae55d92a4eee1bf20bb054e2caf84
parente16360f6d22928bda914305ce2b02a4875971e60
Merge branch 'develop' of https://github.com/gerhard6380/friendica into develop
include/api.php