deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
4313 commits 6 branches 43 tags 25 MiB
Commit graph

4 commits

Author SHA1 Message Date
Riyad Preukschas bda7fe38d0 Merge branch 'master' into discussions 2013-01-15 00:53:00 +01:00
Dmitriy Zaporozhets 68bfcd0521 Add public filter to admin projects 2013-01-13 17:25:18 +02:00
Riyad Preukschas db2c15369c Merge branch 'master' into discussions 
Conflicts:
	app/assets/stylesheets/main.scss
	app/models/project.rb
	app/views/notes/_common_form.html.haml
	app/views/notes/_per_line_form.html.haml
	lib/gitlab/markdown.rb
	spec/models/note_spec.rb
 2012-12-23 01:03:57 +01:00
Dmitriy Zaporozhets 9b57bf7811 Remove main. Use application.scss instead 2012-12-19 20:57:41 +02:00
Renamed from app/assets/stylesheets/main.scss (Browse further)