Dmitriy Zaporozhets 71ab011a17 Merge branch 'use_gollum_wikis' of https://github.com/DanKnox/gitlabhq into DanKnox-use_gollum_wikis ... Conflicts: app/views/layouts/project_resource.html.haml app/views/wikis/edit.html.haml app/views/wikis/pages.html.haml app/views/wikis/show.html.haml spec/features/gitlab_flavored_markdown_spec.rb		2013-03-15 16:55:07 +02:00
..
admin	Fix spinach tests	2013-03-13 21:58:32 +02:00
dashboard	fix spinach after #3196	2013-03-12 14:10:20 +02:00
group	Merge branch 'team-and-group-descriptions' of https://github.com/Undev/gitlabhq into Undev-team-and-group-descriptions	2013-03-01 16:05:51 +02:00
profile	spianch -> profile -> specify within block	2013-03-15 16:05:07 +02:00
project	Merge branch 'use_gollum_wikis' of https://github.com/DanKnox/gitlabhq into DanKnox-use_gollum_wikis	2013-03-15 16:55:07 +02:00
shared	Merge branch 'use_gollum_wikis' of https://github.com/DanKnox/gitlabhq into DanKnox-use_gollum_wikis	2013-03-15 16:55:07 +02:00
userteams	Fix spinach tests	2013-03-14 17:13:00 +02:00