Skip to content
Commit 571d3afa authored by julien mege's avatar julien mege
Browse files

Merge branch 'master' into BS-12169_custom_page_move

Conflicts:
	misc/index.html
	src/bonita.js
	src/multiselect/multiselect.js
	src/repeatable/repeatable.js
	src/sortable/sortable.js
	src/table-settings/tableSettings.js
	test/multiselect/multiselect.spec.js
	test/repeatable/repeatable.spec.js
	test/sortable/sortabble.spec.js
	test/table-settings/table-settings.spec.js
parents c77f4968 e8e3659d
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment