-
Conflicts: mobile/router.js
-
Conflicts: mobile/public/sass/detail.scss mobile/views/controller/detail.js mobile/views/detail.html
Conflicts: mobile/router.js
Conflicts: mobile/public/sass/detail.scss mobile/views/controller/detail.js mobile/views/detail.html