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
..
images	finish up with solarized dark	2013-03-15 15:14:56 +02:00
javascripts	Use wiki tab for wiki, wall, snippets	2013-03-15 14:20:03 +02:00
stylesheets	Merge branch 'use_gollum_wikis' of https://github.com/DanKnox/gitlabhq into DanKnox-use_gollum_wikis	2013-03-15 16:55:07 +02:00