diff options
author | Thomas Citharel <tcit@tcit.fr> | 2015-03-08 00:23:10 +0100 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2015-03-08 00:23:10 +0100 |
commit | 5e10eee8fc2ccc05f511180a8c92f82de6d293b0 (patch) | |
tree | 02ec3705b7e4ff83a7c22154465b40679d25c199 /inc/poche/Routing.class.php | |
parent | 8a66458ba267f01f3525cd635c912574861926fe (diff) | |
parent | 696ead7b465ca1746b7ad70994197c8a1cb26656 (diff) | |
download | wallabag-5e10eee8fc2ccc05f511180a8c92f82de6d293b0.tar.gz wallabag-5e10eee8fc2ccc05f511180a8c92f82de6d293b0.tar.zst wallabag-5e10eee8fc2ccc05f511180a8c92f82de6d293b0.zip |
Merge branch 'dev' of github.com:wallabag/wallabag into dev
Diffstat (limited to 'inc/poche/Routing.class.php')
-rwxr-xr-x | inc/poche/Routing.class.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php index 0d33cdc3..138da48d 100755 --- a/inc/poche/Routing.class.php +++ b/inc/poche/Routing.class.php | |||
@@ -15,6 +15,7 @@ class Routing | |||
15 | protected $view; | 15 | protected $view; |
16 | protected $action; | 16 | protected $action; |
17 | protected $id; | 17 | protected $id; |
18 | protected $autoclose; | ||
18 | protected $url; | 19 | protected $url; |
19 | protected $file; | 20 | protected $file; |
20 | protected $defaultVars = array(); | 21 | protected $defaultVars = array(); |