Added notifications when receiving a chat message and not looking at the chat of that user
fixes issue #142 messy validation
another one
add braces
Try to change the layout of "Known to work on"

IMHO this way is more readable.
(For text formatting i followed this guide: https://help.github.com/articles/github-flavored-markdown#tables)
Option to delete chat while deleting a friend
Merge pull request #145 from dethstar/master

fixes issue #142 messy validation
Merge pull request #143 from Proplex/master

Update icon with white outline (experimental), darken actionbar
Merge pull request #148 from Ansa89/patch-1

Try to change the layout of "Known to work on"
Merge remote-tracking branch 'upstream/master'
option to delete chat while deleting a friend
fixing conflicts

delete chat while deleting a friend
Merge fix
Merge pull request #144 from ollieh/master

Added notifications when receiving a chat message and not looking at the...
Merge remote-tracking branch 'upstream/master'
Update README.md
git reset HEAD app/src/main/java/im/tox/antox/ChatFragment.java
git reset HEAD app/src/main/java/im/tox/antox/FriendsListAdapter.java
bug fix in updateChat

bug fix in updateChat
Merge remote-tracking branch 'upstream/master'
Merge pull request #151 from strider29/master

optional delete chat and bug fix in updateChat
Changing some wording