Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
6523b6b342efcf9a036d340d4bea445bee0c41ad
habitica/website/common
T
History
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
..
errors
Improved number validation (#11131)
2019-04-23 15:19:49 -05:00
locales
Merge branch 'develop' of https://github.com/HabitRPG/habitica into autocomplete-username
2019-09-19 16:08:13 +02:00
script
Merge branch 'release' into develop
2019-09-17 16:11:30 -05:00
index.js
Common reorg (#8025)
2016-09-16 17:18:07 +02:00
README.md
Common reorg (#8025)
2016-09-16 17:18:07 +02:00

README.md

Common

Files that are shared among the server and the client.

  • Code that is run on both the client and the server
  • Item definitions - weapons, armor, pets, etc
Reference in New Issue View Git Blame Copy Permalink