]> git.mxchange.org Git - friendica.git/commit - js/main.js
Merge branch 'develop' into rewrites/coding-convention-split2-1-2
authorRoland Häder <roland@mxchange.org>
Fri, 14 Apr 2017 15:45:10 +0000 (17:45 +0200)
committerRoland Haeder <roland@mxchange.org>
Fri, 14 Apr 2017 15:56:51 +0000 (17:56 +0200)
commit9423db628fd11c7c7290802d1311398c630c702e
tree1fcfe9f5ebf1526af3c6724f5a0e0fca15587911
parentfcf095cc6e7059395941a7bc25c2eb3d932acf0e
parenta0a0885527e41e635f12d455890ac2ade62349c6
Merge branch 'develop' into rewrites/coding-convention-split2-1-2

Signed-off-by: Roland Haeder <roland@mxchange.org>
include/acl_selectors.php