benji 78863c40b7 Merge branch 'master' into filter-datatables		2015-09-10 21:49:08 +02:00
..
concerns	comment filters until input is fixed	2015-09-10 21:42:20 +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	Make transaction form remote	2015-09-10 21:46:05 +02:00
users_controller.rb	Merge branch 'master' into filter-datatables	2015-09-10 21:49:08 +02:00