diff options
| author | Felix Ableitner <me@nutomic.com> | 2020-03-18 22:51:34 +0100 |
|---|---|---|
| committer | Felix Ableitner <me@nutomic.com> | 2020-03-18 22:51:34 +0100 |
| commit | 33cce053003f04a0c4e3cacae3d8caeb93f96a4a (patch) | |
| tree | acdf220ec3e1ad5037a8a14e77afd85b685a9d47 /.gitignore | |
| parent | 390b204272e06a1b880ea63ae4f12183fb8dc555 (diff) | |
| parent | ed0dd3b8c00d51989e8f652a3fa904c7b1eb7ec7 (diff) | |
Merge branch 'master' into federation
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -14,4 +14,4 @@ build/ ui/src/translations # ide config -.idea/
\ No newline at end of file +.idea/ |