diff options
| author | IgnatzHome <ignatz@maschath.de> | 2018-05-17 20:21:07 +0200 |
|---|---|---|
| committer | IgnatzHome <ignatz@maschath.de> | 2018-05-17 20:21:07 +0200 |
| commit | 9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874 (patch) | |
| tree | 47ffe9a487aa6d66bbb4cd327ca248c4b30fda4a /client/components/sidebar/sidebar.js | |
| parent | c0c7b269a794fb28ddf5ffc17744f6724041de96 (diff) | |
| parent | 8b16955cc27b29ae507be084adccc4fad61b05ef (diff) | |
| download | wekan-9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874.tar.gz wekan-9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874.tar.bz2 wekan-9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874.zip | |
resolving merge conflicts
Diffstat (limited to 'client/components/sidebar/sidebar.js')
| -rw-r--r-- | client/components/sidebar/sidebar.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/client/components/sidebar/sidebar.js b/client/components/sidebar/sidebar.js index bff96dcb..5a9de74b 100644 --- a/client/components/sidebar/sidebar.js +++ b/client/components/sidebar/sidebar.js @@ -6,6 +6,7 @@ const viewTitles = { filter: 'filter-cards', search: 'search-cards', multiselection: 'multi-selection', + customFields: 'custom-fields', archives: 'archives', }; |