1. 23 Dec, 2012 1 commit
    • Riyad Preukschas's avatar
      Merge branch 'master' into discussions · db2c1536
      Riyad Preukschas authored
      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
      db2c1536
  2. 22 Dec, 2012 13 commits
  3. 21 Dec, 2012 8 commits
  4. 20 Dec, 2012 18 commits