huginn/db
Dominik Sander f07db9c97c Merge remote-tracking branch 'huginn/master' into omniauth
Conflicts:
	app/models/agents/basecamp_agent.rb
	app/models/user.rb
	db/schema.rb
	spec/fixtures/agents.yml
2014-06-20 19:07:06 +02:00
..
migrate Merge remote-tracking branch 'huginn/master' into omniauth 2014-06-20 19:07:06 +02:00
schema.rb Merge remote-tracking branch 'huginn/master' into omniauth 2014-06-20 19:07:06 +02:00
seeds.rb Solves #354 2014-06-02 20:33:46 +10:00