Tim Daubenschütz a7478cdcb5 resolve merge conflicts

2015-06-05 11:40:49 +02:00

..

ascribe_accordion_list

add es6lint to build process and fix most (not really) errors and warnings

2015-06-05 11:06:36 +02:00

ascribe_buttons

resolve merge conflicts

2015-06-05 11:40:49 +02:00

ascribe_forms

resolve merge conflicts

2015-06-05 11:40:49 +02:00

ascribe_media

add es6lint to build process and fix most (not really) errors and warnings

2015-06-05 11:06:36 +02:00

ascribe_modal

resolve merge conflicts

2015-06-05 11:40:49 +02:00

ascribe_pagination

add es6lint to build process and fix most (not really) errors and warnings

2015-06-05 11:06:36 +02:00

ascribe_piece_list_bulk_modal

resolve merge conflicts

2015-06-05 11:40:49 +02:00

ascribe_piece_list_toolbar

add es6lint to build process and fix most (not really) errors and warnings

2015-06-05 11:06:36 +02:00

ascribe_table

minor fixes

2015-06-05 11:32:10 +02:00

ascribe_app.js

add es6lint to build process and fix most (not really) errors and warnings

2015-06-05 11:06:36 +02:00

edition_container.js

add es6lint to build process and fix most (not really) errors and warnings

2015-06-05 11:06:36 +02:00

edition.js

resolve merge conflicts

2015-06-05 11:40:49 +02:00

header.js

resolve merge conflicts

2015-06-05 11:40:49 +02:00

piece_list.js

add es6lint to build process and fix most (not really) errors and warnings

2015-06-05 11:06:36 +02:00