rosa-build/db
Alexander Machehin 0cb585ef71 Merge branch 'master' into 29-migrate-to-ruby-2.1
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/activity_feeds_controller.rb
	app/models/activity_feed_observer.rb
	config/environments/development.rb
	config/initializers/a_app_config.rb
	config/initializers/airbrake.rb
	lib/modules/models/git.rb
	spec/controllers/activity_feeds_controller_spec.rb
	spec/helpers/activity_feeds_helper_spec.rb
2014-01-10 08:31:31 +06:00
..
migrate Merge branch 'master' into 29-migrate-to-ruby-2.1 2014-01-10 08:31:31 +06:00
schema.rb #328: rename field: new_commit to update_code 2013-11-27 13:28:11 +04:00
seeds.rb #29: merge master into branch 2013-04-03 16:10:22 +04:00