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
..
feedback_mailer.rb	[refs #652] set url options for mailer	2012-09-24 19:02:21 +06:00
user_mailer.rb	Merge branch 'master' into 29-migrate-to-ruby-2.1	2014-01-10 08:31:31 +06:00