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
..
admin_routing_spec.rb	Fix route specs	2013-06-26 20:17:07 +03:00
notifications_routing_spec.rb	Move Profile related controllers under Profiles:: module	2013-06-24 18:24:14 +03:00
project_routing_spec.rb	Merge branch 'master' into 6-0-dev	2013-07-02 11:47:09 +03:00
routing_spec.rb	Move Profile related controllers under Profiles:: module	2013-06-24 18:24:14 +03:00