Skip to content
Snippets Groups Projects
Commit 775dceb8 authored by Francisco Juan's avatar Francisco Juan
Browse files

Merge commit 'tags/v1.4.0' 

Conflicts:
	app/views/help/wiki_syntax_detailed.html.erb
	public/favicon.ico
parents 951b204e aae1abde
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 130 additions and 59 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment