diff options
| author | Pim van den Berg | 2015-06-22 10:20:29 +0200 |
|---|---|---|
| committer | Pim van den Berg | 2015-06-22 10:20:46 +0200 |
| commit | 94ecdc72a5f244b3ffdeb9cfe256ad6e544b7228 (patch) | |
| tree | 2e02c39bc51a70a48adca54f9dbafeb45f3631d5 /conf | |
| parent | responsive: introduce a hamburger navicon to toggle the menu on smaller devices (diff) | |
| parent | Adding support for local plugin json to override the global stuff (diff) | |
| download | apt-panopticon_cgp-94ecdc72a5f244b3ffdeb9cfe256ad6e544b7228.zip apt-panopticon_cgp-94ecdc72a5f244b3ffdeb9cfe256ad6e544b7228.tar.gz apt-panopticon_cgp-94ecdc72a5f244b3ffdeb9cfe256ad6e544b7228.tar.bz2 apt-panopticon_cgp-94ecdc72a5f244b3ffdeb9cfe256ad6e544b7228.tar.xz | |
Merge branch 'local_plugins'
Closes #114
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/conf/.gitignore b/conf/.gitignore index 529bf01..880b7c3 100644 --- a/conf/.gitignore +++ b/conf/.gitignore | |||
| @@ -1 +1,2 @@ | |||
| 1 | config.local.php | 1 | config.local.php |
| 2 | plugin | ||