habitica-self-host/website/server
Phillip Thelen 6523b6b342 Merge branch 'develop' of https://github.com/HabitRPG/habitica into autocomplete-username
# Conflicts:
#	package.json
#	website/client/components/chat/autoComplete.vue
#	website/client/components/chat/chatCard.vue
#	website/client/components/groups/chat.vue
#	website/server/controllers/api-v3/chat.js
#	website/server/controllers/api-v3/members.js
#	website/server/controllers/api-v4/members.js
2019-09-19 16:08:13 +02:00
..
controllers Merge branch 'develop' of https://github.com/HabitRPG/habitica into autocomplete-username 2019-09-19 16:08:13 +02:00
libs Merge branch 'develop' of https://github.com/HabitRPG/habitica into autocomplete-username 2019-09-19 16:08:13 +02:00
middlewares Squashed commit of the following: 2019-08-02 15:49:41 -05:00
models Merge branch 'develop' of https://github.com/HabitRPG/habitica into autocomplete-username 2019-09-19 16:08:13 +02:00
.eslintrc Upgrade ESLint to v3 (#8299) 2016-12-20 22:31:36 +01:00
api-doc.js Improved API documentation for hall #8087 (#8536) 2017-06-06 11:48:11 -07:00
index.js gcp stackdriver tracing: attach user id (#11033) 2019-02-27 18:47:33 +01:00
server.js fix(logging): move Stackdriver init higher up (#11025) 2019-02-24 14:05:59 +01:00