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
..
_blob.html.haml	Add user_color_scheme_class helper	2012-11-27 22:51:05 +01:00
_form.html.haml	Add ace editor to snippets	2012-12-12 19:42:08 +02:00
_snippet.html.haml	added NamespacedProject role. Extended project info displayed for admin. Fixed project limit	2012-12-14 08:14:05 +03:00
edit.html.haml	Snippets - fixed after bootstrap	2012-02-08 01:00:49 +02:00
index.html.haml	added NamespacedProject role. Extended project info displayed for admin. Fixed project limit	2012-12-14 08:14:05 +03:00
new.html.haml	Snippets - fixed after bootstrap	2012-02-08 01:00:49 +02:00
show.html.haml	Merge branch 'master' into discussions	2012-12-23 01:03:57 +01:00