Merge remote-tracking branch 'origin/trz/master' into trz/master

2015-04-12 17:24:10 +02:00 · 2015-04-12 17:24:10 +02:00 · d64aa6407c
commit d64aa6407c
parent cae106e310 fd5f36b864
1 changed files with 1 additions and 3 deletions
--- a/4
+++ b/4
@ -1,10 +1,8 @@
 settings:
- differ between receive and read message
 - cleanup and structure
 code:
 - check parseTimestamp
- no trim() on message body
- check status color under avatar for conferences
+- change crash reports
 general:
 - add comments to code of XEPs
 - add comments in general