Vladimir Sharshov 4828aa24f8 Merge branch 'master' into 349-anonymous_access ... Conflicts: spec/controllers/platforms/maintainers_controller_spec.rb spec/factories/build_lists.rb		2012-09-07 00:36:06 +04:00
..
assets	Merge pull request #622 from warpc/620-maintainer_db	2012-08-31 11:50:02 -07:00
controllers	Merge branch 'master' into 349-anonymous_access	2012-09-07 00:36:06 +04:00
helpers	[issue #590] Log returns through Rails with `tail -n`	2012-08-17 12:23:49 +04:00
mailers	[issue #565] Refactoring. Fixed html mail template.	2012-07-20 23:59:32 +04:00
models	Merge branch 'master' into 349-anonymous_access	2012-09-07 00:36:06 +04:00
presenters	[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
views	[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