- Merged with master done
This commit is contained in:
1 parent
6cb5e7bba8
commit
e3b22335e1
1 file changed
+2
-2
@@ -66,8 +66,8 @@ class ApplicationStrategy extends Strategy\ApplicationStrategy {
|
|||||||
|
|
||||||
return $this->di->get('error.404');
|
return $this->di->get('error.404');
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
}
|
}
|
||||||
|
|
||||||
>>>>>>> af8b686 (- WIP on ulmus-user mechanics updates)*/
|
>>>>>>> af8b686 (- WIP on ulmus-user mechanics updates)*/
|
||||||
|
|||||||
Reference in new issue
Block a user