]> git.mxchange.org Git - friendica.git/commit
Merge branch 'omigeot-master'
authorFriendika <info@friendika.com>
Sat, 5 Feb 2011 21:01:28 +0000 (13:01 -0800)
committerFriendika <info@friendika.com>
Sat, 5 Feb 2011 21:01:28 +0000 (13:01 -0800)
commitc26463b65b4b98f9aca77781fd74a7fe99f73814
tree341d42356870f767cb6711ddf274f9e7665af096
parent8cced061bba8d5ef18e2fa5ead0edcdc90d06e73
parentc4ddee005ebcf912c913e12a17e65ab8826650a6
Merge branch 'omigeot-master'

Conflicts:
view/fr/strings.php