Tim Daubenschütz 95f4efa92d merge conflict		2015-06-05 16:21:36 +02:00
..
acl_button_list.js	merge conflict	2015-06-05 16:21:36 +02:00
acl_button.js	resolve merge conflicts	2015-06-05 11:40:49 +02:00
button_submit_close.js	add details to piece detail page	2015-06-05 14:22:02 +02:00