Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Merge branch 'master' into feature-receive

Browse source 
Conflicts:
	config/locales/de.yml
This commit is contained in:
wvengen 2014-01-11 15:56:33 +01:00
commit cb3e2f7ca0
4 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/locales/en.yml
View file

@ -1211,7 +1211,7 @@ en:
title_list: List of pages
body:
title_toc: Content
wikicloth_exception: "I'm sorry to report that an error occured when interpreting the wiki page: %{msg}. Please try to fix it, and save the page again."
wikicloth_exception: ! 'I''m sorry to report that an error occured when interpreting the wiki page: %{msg}. Please try to fix it, and save the page again.'
create:
notice: Page was created
cshow: