Felix Van der Jeugt 079c1ea4d0 Merge branch 'master' into datagrid		2015-09-10 16:18:46 +02:00
..
concerns	replace datatables for user with datagrid for transactions	2015-09-10 00:35:59 +02:00
application_controller.rb	current fix for x-api-key	2015-09-10 15:43:00 +02:00
callbacks_controller.rb	Add omniauth strategie for zeuswpi	2015-09-08 13:34:29 +02:00
transactions_controller.rb	Merge branch 'master' into datagrid	2015-09-10 16:18:46 +02:00
users_controller.rb	Merge branch 'master' into datagrid	2015-09-10 16:18:46 +02:00