ddejongh c6e97d916d Merge remote-tracking branch 'remotes/origin/master' into AD-51-easy-to-view-manage-1-editions-coi ...

Conflicts:
	piece/models.py
	web/urls/frontend.py

2015-05-29 15:27:40 +02:00

..

alert.js

form framework

2015-05-29 01:54:56 +02:00

button_submit_close.js

merged all branches

2015-05-29 10:58:07 +02:00

form_consign.js

errors for non-fields, 500

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

form_share_email.js

merged all branches

2015-05-29 10:58:07 +02:00

form_transfer.js

form framework

2015-05-29 01:54:56 +02:00

input_text.js

Merge remote-tracking branch 'remotes/origin/master' into AD-51-easy-to-view-manage-1-editions-coi

2015-05-29 15:27:40 +02:00

input_textarea.js

Merge remote-tracking branch 'remotes/origin/master' into AD-51-easy-to-view-manage-1-editions-coi

2015-05-29 15:27:40 +02:00