diff options
| author |  Michael Lehenbauer <mikelehen@google.com> | 2018-01-09 12:57:21 -0800 |
|---|---|---|
| committer | Michael Lehenbauer <mikelehen@google.com> | 2018-01-09 12:57:21 -0800 |
| commit | aa00c7444982de08b21604965a708d1cad5188f7 (patch) | |
| tree | 166325a14805321cbf5045fdd4a52dd634747218 /.gitignore | |
| parent | 2c6682c66ea7b86b3b7cb52e623086b4184d500a (diff) | |
| parent | c18af34fca72b5721cab4e3b26da7469df8fcc6b (diff) | |
Merge branch 'master' into mikelehen/merge-master-to-firestore-api-changes
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -33,6 +33,9 @@ DerivedData *.hmap *.ipa +# IntelliJ +.idea + # Vim *.swo *.swp @@ -57,4 +60,5 @@ Podfile.lock # CMake .downloads -.idea/ +Debug +Release |