krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 22:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/flagpm

Browse Source 
# Conflicts:
#	website/client/store/actions/chat.js
This commit is contained in:
negue
2018-06-25 18:47:47 +02:00
parent 97e1465899 ed27ac15c8
commit 31ef21f25c
601 changed files with 31507 additions and 28325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/client/components/chat/chatCard.vue
View File

@@ -273,7 +273,7 @@ export default {
this.$emit('message-removed', message);
if (this.inbox) {
axios.delete(`/api/v3/user/messages/${message.id}`);
axios.delete(`/api/v4/user/messages/${message.id}`);
this.$delete(this.user.inbox.messages, message.id);
return;
}