]> git.mxchange.org Git - friendica.git/commit - js/acl.js
Merge branch 'master' into fixes
authorOlaf Conradi <olaf@conradi.org>
Sun, 30 Dec 2012 00:30:00 +0000 (01:30 +0100)
committerOlaf Conradi <olaf@conradi.org>
Sun, 30 Dec 2012 00:30:00 +0000 (01:30 +0100)
commitc5845be74edd2e48d743772c3dd31e6ad5c2a25e
tree89a804b35a574c787fd02eca49b2672a92a38c5d
parentdbf8f711cffbc7b659a06856b2301820c66274ca
parent4b2de6fdf2cd1778ccc249ca152ffb352bcfb73b
Merge branch 'master' into fixes