Alexander Machehin ccb004bc03 Merge branch 'master' into 579-code_line_comments ... Conflicts: app/assets/stylesheets/design/custom.scss		2012-09-26 16:27:46 +06:00
..
assets	Merge branch 'master' into 579-code_line_comments	2012-09-26 16:27:46 +06:00
controllers	Merge pull request #657 from warpc/648-add-filters-to-projects-page	2012-09-25 03:41:11 -07:00
helpers	Merge pull request #657 from warpc/648-add-filters-to-projects-page	2012-09-25 03:41:11 -07:00
mailers	[refs #652] set url options for mailer	2012-09-24 19:02:21 +06:00
models	Merge pull request #657 from warpc/648-add-filters-to-projects-page	2012-09-25 03:41:11 -07:00
presenters	[refs #616] cheat sheet small i18n	2012-09-20 00:53:40 +06:00
views	Merge pull request #657 from warpc/648-add-filters-to-projects-page	2012-09-25 03:41:11 -07:00