Dominik Sander b71ea25418 Merge branch 'master' into omniauth ... Conflicts: Gemfile.lock app/controllers/agents_controller.rb		2014-07-31 22:14:44 +02:00
..
migrate	Merge branch 'master' into omniauth	2014-07-31 22:14:44 +02:00
schema.rb	Merge remote-tracking branch 'huginn/master' into omniauth	2014-06-20 19:07:06 +02:00
seeds.rb	fix some more XPaths	2014-07-30 14:05:40 -07:00