Vladimir Sharshov 2c1df5cd14 Merge branch 'master' into 263-refactoring ... Conflicts: config/deploy.rb db/schema.rb		2012-09-06 21:14:14 +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 263-refactoring	2012-09-06 21:14:14 +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 263-refactoring	2012-09-06 21:14:14 +04:00
presenters	[issue #620] Changes in Maintainer db:	2012-08-24 19:21:24 +04:00
views	Merge pull request #622 from warpc/620-maintainer_db	2012-08-31 11:50:02 -07:00