merge mail with master, fix conflicts

2017-12-17 20:22:56 +01:00
parent 930fea6fad 6d73bb4b57
commit 46fa2557d7
217 changed files with 22013 additions and 26319 deletions
--- a/include/mail.h
+++ b/include/mail.h
@@ -1,8 +1,6 @@
 #ifndef GUARD_MAIL_H
 #define GUARD_MAIL_H

-#include "items.h"
-
 #define IS_ITEM_MAIL(itemId)((itemId == ITEM_ORANGE_MAIL            \
                              || itemId == ITEM_HARBOR_MAIL         \
                              || itemId == ITEM_GLITTER_MAIL        \