vrde 641e8ac82d Merge remote-tracking branch 'origin/master' into piece-detail-mediaplayer ...

Conflicts:
	js/components/edition.js
	js/mixins/inject_in_head_mixin.js

2015-06-03 17:44:13 +02:00

..

alert_mixin.js

errors for non-fields, 500

2015-05-29 15:16:42 +02:00

form_mixin.js

fixed form mixin

2015-06-02 18:16:18 +02:00

inject_in_head_mixin.js

Add support for videos and images

2015-06-03 16:53:27 +02:00

modal_mixin.js

errors for non-fields, 500

2015-05-29 15:16:42 +02:00

table_column_mixin.js

refactor general utils

2015-06-02 13:42:17 +02:00