Option to delete chat while deleting a friend
Merge remote-tracking branch 'upstream/master'
option to delete chat while deleting a friend
fixing conflicts

delete chat while deleting a friend
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
Update README.md
Better wording
Clear chat notification if seen relevant chat
Merge branch 'master' of https://github.com/Astonex/Antox