rosa-build/app/presenters
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
..
git_presenters Merge branch 'master' into 29-migrate-to-ruby-2.1 2014-01-10 08:31:31 +06:00
application_presenter.rb #29: removed hack for encoding 2013-03-18 15:36:16 +04:00
comment_presenter.rb Merge branch 'master' into 29-migrate-to-ruby-2.1 2014-01-10 08:31:31 +06:00
maintainer_presenter.rb [refs #349] Disable global menu Projects and Platforms; Allowed full search; Protect user and maintainer emails; Refactoring right rules 2012-09-06 21:09:10 +04:00