]> git.mxchange.org Git - friendica.git/commit
Merge branch 'fabrixxm-master'
authorFriendika <info@friendika.com>
Tue, 15 Feb 2011 21:40:25 +0000 (13:40 -0800)
committerFriendika <info@friendika.com>
Tue, 15 Feb 2011 21:40:25 +0000 (13:40 -0800)
commitc5f5102396cee8ec691fd22d486070ec3d5f243d
tree2134bc487e6ccbca7871e119a1f76e6f6852ebf8
parent603dc34fa01026a843daedfbdb0f06748210c429
parent97723ad69f71c716bd0e68eec95944b5469008ec
Merge branch 'fabrixxm-master'

Conflicts:
addon/statusnet/statusnet.php
util/strings.php
util/strings.php