diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-06-03 10:50:17 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-06-03 10:50:17 +0100 |
| commit | 050b25bd70909913b7e42d53cb69c31b1396cc46 (patch) | |
| tree | ac2f2b587ffa3504c5cf5164b36f5f436c0582f4 /app/helpers/config_helper.rb | |
| parent | 4db18138584b6394286bbe374f22e6609ab79136 (diff) | |
| parent | e30a8623a1706d3bad4476198085547d8f47cc88 (diff) | |
Merge branch 'release/0.11' into wdtk
Diffstat (limited to 'app/helpers/config_helper.rb')
| -rw-r--r-- | app/helpers/config_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/config_helper.rb b/app/helpers/config_helper.rb index 73e12172f..026600ff1 100644 --- a/app/helpers/config_helper.rb +++ b/app/helpers/config_helper.rb @@ -1,5 +1,5 @@ module ConfigHelper def site_name - Configuration::site_name + AlaveteliConfiguration::site_name end -end
\ No newline at end of file +end |