]> git.mxchange.org Git - friendica.git/commit - util/README
Merge branch 'erikl-master'
authorFriendika <info@friendika.com>
Mon, 4 Apr 2011 22:46:33 +0000 (15:46 -0700)
committerFriendika <info@friendika.com>
Mon, 4 Apr 2011 22:46:33 +0000 (15:46 -0700)
commit1bba63fb607c2cb5fb2c002e63ad7128ecf8b1ea
tree0c34fbaa00d6eab272e6bd48a596d146d708cef8
parent91588934d2e07d06ac9353ac899bcb470cc293f0
parenta0d2747d527221fc517e5d277035d6e5b07ebf93
Merge branch 'erikl-master'

Conflicts:
view/sv/settings.tpl
view/sv/profile_edit.tpl
view/sv/settings.tpl
view/sv/strings.php