Merge branch 'master' of github.com:gitlabhq/gitlabhq into arthurschreiber-use_r…

…edcarpet_for_markdown

Merge branch 'master' of github.com:gitlabhq/gitlabhq into arthurschreiber-use_r…
…edcarpet_for_markdown
Dmitriy Zaporozhets
2 parents 9cb51c6e 680ee045
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
app/views/notes/_form.html.haml
@@ -29,7 +29,7 @@
           %div.file_name File name...
           %button.file_upload.btn.small Upload File
           .input= f.file_field :attachment, :class => "input-file"
-        %span Any file less then 10 MB
+        %span Any file less than 10 MB
  
  
   = f.submit 'Add Comment', :class => "btn primary", :id => "submit_note"
...	...	@@ -29,7 +29,7 @@
29	29	%div.file_name File name...
30	30	%button.file_upload.btn.small Upload File
31	31	.input= f.file_field :attachment, :class => "input-file"
32		- %span Any file less then 10 MB
	32	+ %span Any file less than 10 MB
33	33
34	34
35	35	= f.submit 'Add Comment', :class => "btn primary", :id => "submit_note"
...	...