]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b101c6 495d0fb)
Merge pull request #32 from copyninja/master
authortobiasd <tobias.diekershoff@gmx.net>
Sun, 12 Feb 2012 09:42:43 +0000 (01:42 -0800)
committertobiasd <tobias.diekershoff@gmx.net>
Sun, 12 Feb 2012 09:42:43 +0000 (01:42 -0800)
Mapped ;) :D and :-O smileys


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.