diff options
| author | Felix Ableitner <me@nutomic.com> | 2020-03-12 12:34:37 +0100 |
|---|---|---|
| committer | Felix Ableitner <me@nutomic.com> | 2020-03-12 12:34:37 +0100 |
| commit | 063811cb60028037d79cf8f3c22e1e8c9f3af8ce (patch) | |
| tree | a636941025bc5fbc77d0841abbf92abab773ad82 /.gitignore | |
| parent | 27c07f1f84d02bf8baa2bceb1d8a0effac67a6c9 (diff) | |
| parent | 4fbf55d79e355608c75aa8218cd7f487c58fa04d (diff) | |
Merge branch 'master' into federation
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -6,3 +6,5 @@ docker/dev/env_deploy.sh docker/federation-test/volumes build/ .idea/ +ui/src/translations +docker/dev/volumes
\ No newline at end of file |