Merge branch 'master' into develop

yawik · Aug 23, 2017 · 480935b · 480935b
2 parents 8ca3999 + 6dce0fc
commit 480935b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,4 @@
+dist: trusty
 language: php
 php:
   - "5.6"

diff --git a/config/module.config.php b/config/module.config.php
@@ -19,7 +19,7 @@
 
     'view_manager' => array(
         'template_map' => array(
-            'registration\completed' => __DIR__ . '/../view/yawik-company-registration/registration/complete.phtml',
+            'registration\completed' => __DIR__ . '/../view/company-registration/registration/complete.phtml',
         ),
 
         'template_path_stack' => array(