deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'wiki'

Browse source 
Conflicts:
	app/views/layouts/_project_menu.html.haml
This commit is contained in:
Dmitriy Zaporozhets 2012-02-21 20:32:43 +02:00
commit ce8eba8913
22 changed files with 294 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/main.scss
View file

@ -72,4 +72,6 @@ $hover: #FDF5D9;
@import "highlight.css.scss";
@import "highlight.black.css.scss";
@import "wiki.scss";