Dmitriy Zaporozhets f438bd415f Merge branch 'master' into 6-0-dev ... Conflicts: app/controllers/admin/teams/projects_controller.rb app/views/team_members/_team_member.html.haml app/views/teams/members/_member.html.haml		2013-06-30 11:35:40 +03:00
..
api	Fix paths to the Contents Markdown pages	2013-06-11 11:36:54 -03:00
install	Doc: set permission on config.database.yml	2013-06-29 17:31:08 +03:00
markdown	Adding detailed documentation of the markdown syntax.	2013-06-29 00:44:24 -05:00
raketasks	…
update	Merge branch 'master' into 6-0-dev	2013-06-30 11:35:40 +03:00
make_release.md	…