Mohit Panjwani 425ad1e939 Merge branch 'fix-view-status' into 'master' ...

Fix view status

See merge request mohit.panjvani/crater-web!37

2019-11-17 06:22:42 +00:00

..

components

merge dev

2019-11-16 16:33:19 +05:30

helpers

…

plugins

Merge branch 'fix-view-status-action' into 'master'

2019-11-17 06:22:16 +00:00

services

…

store

Merge branch 'fix-view-status' into 'master'

2019-11-17 06:22:42 +00:00

stub

…

views

Merge branch 'fix-view-status' into 'master'

2019-11-17 06:22:42 +00:00

app.js

…

bootstrap.js

…

router.js

fix conflicts

2019-11-14 15:51:48 +05:30