]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 603dc34 97723ad)
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)
Conflicts:
addon/statusnet/statusnet.php
util/strings.php

1  2 
util/strings.php patch | diff1 | diff2 | blob | history

diff --cc util/strings.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.