Merge branch 'master' into '111-full-reaction-with-aliases'
# Conflicts: # frontend-js/src/main/js/map/data/Reaction.js
No related branches found
No related tags found
This commit is part of merge request !16. Comments created here will be created in the context of that merge request.
Showing
- frontend-js/src/main/js/map/data/Reaction.js 10 additions, 1 deletionfrontend-js/src/main/js/map/data/Reaction.js
- frontend-js/src/test/js/map/data/Reaction-test.js 7 additions, 24 deletionsfrontend-js/src/test/js/map/data/Reaction-test.js
- frontend-js/testFiles/reaction.json 44 additions, 0 deletionsfrontend-js/testFiles/reaction.json
Loading
Please register or sign in to comment