https://reisub.nsupdate.info/git / friendica.git / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d2a9ce9 e4b1c07)
Merge pull request #35 from copyninja/master
authorVasudev Kamath <kamathvasudev@gmail.com>
Tue, 14 Feb 2012 17:43:05 +0000 (09:43 -0800)
committerVasudev Kamath <kamathvasudev@gmail.com>
Tue, 14 Feb 2012 17:43:05 +0000 (09:43 -0800)
:'( :-! :-/ 8-) :-[ smiley's are mapped.


Trivial merge
mirror https://github.com/friendica/friendica.git