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 /.gitignore | |
| parent | c0c7b269a794fb28ddf5ffc17744f6724041de96 (diff) | |
| parent | 8b16955cc27b29ae507be084adccc4fad61b05ef (diff) | |
| download | wekan-9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874.tar.gz wekan-9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874.tar.bz2 wekan-9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874.zip | |
resolving merge conflicts
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -15,3 +15,4 @@ package-lock.json **/prime **/*.snap snap/.snapcraft/ +.idea |