diff options
| author | Marc Florisson | 2012-12-18 15:39:57 +0100 |
|---|---|---|
| committer | Marc Florisson | 2012-12-18 15:39:57 +0100 |
| commit | 3366e569f436cf1fab70d64320704cfe78bbad8e (patch) | |
| tree | 9208e6c9ceb6b29b9760200bfbc83075e93f0f86 /app | |
| parent | 783a183886fe9bd5a355cb08d18da43a3cc129eb (diff) | |
| parent | af311cd2f3b20c39b2b5f78fb4001406b4daae53 (diff) | |
| download | chouette-core-3366e569f436cf1fab70d64320704cfe78bbad8e.tar.bz2 | |
Merge branch 'master' into api_key
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/help_page.rb | 1 | ||||
| -rw-r--r-- | app/models/test_sheet_page.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/models/help_page.rb b/app/models/help_page.rb index aa0c9c2b6..ea9d34e44 100644 --- a/app/models/help_page.rb +++ b/app/models/help_page.rb @@ -1,3 +1,4 @@ +#encoding: utf-8 class HelpPage attr_accessor :slug, :content, :data diff --git a/app/models/test_sheet_page.rb b/app/models/test_sheet_page.rb index da808f411..880e28c76 100644 --- a/app/models/test_sheet_page.rb +++ b/app/models/test_sheet_page.rb @@ -1,3 +1,4 @@ +#encoding: utf-8 class TestSheetPage attr_accessor :slug, :content, :data |