Merge branch 'master' into hethi/fix-faq-example-comment

This commit is contained in:
Herbert Thielen
2017-08-31 16:12:27 +02:00
committed by GitHub
2 changed files with 2 additions and 2 deletions

2
.gitignore vendored
View File

@@ -8,3 +8,5 @@ bazel-genfiles
bazel-googletest bazel-googletest
bazel-out bazel-out
bazel-testlogs bazel-testlogs
# python
*.pyc

View File

@@ -1,2 +0,0 @@
# python
*.pyc