Thomas Willingham
|
47449e6238
|
Fixed typo in smiley name.
|
2012-03-28 04:27:00 +01:00 |
|
Thomas Willingham
|
73ec380c7c
|
Merge remote-tracking branch 'upstream/master'
|
2012-03-28 04:26:46 +01:00 |
|
Thomas Willingham
|
3a57b092d2
|
Merge branch 'master' of github.com:beardy-unixer/friendica-addons
Conflicts:
.gitignore
|
2012-03-25 00:13:13 +00:00 |
|
Thomas Willingham
|
b388a8e2a2
|
deleted: .gitignore
On second thoughts, better leave that to Mike since I don't really know what I'm doing
|
2012-03-25 00:10:22 +00:00 |
|
Thomas Willingham
|
83670ac5bd
|
Update .gitignore
|
2012-03-25 00:09:19 +00:00 |
|
Thomas Willingham
|
4a4bf31fae
|
Merge remote-tracking branch 'upstream/master'
|
2012-03-25 00:02:16 +00:00 |
|