Dmitriy Zaporozhets ee890f2b2a Merge branch 'master' into 6-0-dev ... Conflicts: app/views/dashboard/projects.html.haml app/views/layouts/_head_panel.html.haml config/routes.rb		2013-07-02 11:47:09 +03:00
..
contexts	…
controllers	…
factories	…
features	Merge branch 'master' into 6-0-dev	2013-07-02 11:47:09 +03:00
fixtures	Ability to edit comments	2013-07-01 10:48:02 +01:00
helpers	…
javascripts	…
lib	…
mailers	…
models	…
observers	…
requests/api	…
routing	Merge branch 'master' into 6-0-dev	2013-07-02 11:47:09 +03:00
services	…
support	Fix spinach test	2013-06-26 19:13:29 +03:00
tasks/gitlab	…
workers	…
factories.rb	Merge branch 'master' into 6-0-dev	2013-07-02 11:47:09 +03:00
factories_spec.rb	…
seed_project.tar.gz	…
spec_helper.rb	…