Alexander Machehin 03e2057a5a Merge branch 'master' into 42-issue_api ... Conflicts: db/schema.rb		2013-04-17 23:35:37 +06:00
..
assets	Merge pull request #94 from abf/rosa-build:93-support-git-submodule	2013-04-11 14:15:47 +04:00
controllers	Merge branch 'master' into 42-issue_api	2013-04-17 23:35:37 +06:00
helpers	#96: hotfix	2013-04-11 16:07:29 +04:00
mailers	#91: remove greeting from issue_assign_notification, update specs	2013-04-09 16:57:29 +04:00
models	Merge pull request #87 from abf/rosa-build:82-extend-abilities-of-personal-platforms	2013-04-17 14:34:36 +04:00
presenters	[#19] fix error with undefined method `project`	2013-04-10 18:26:23 +06:00
views	Merge branch 'master' into 42-issue_api	2013-04-17 23:35:37 +06:00