Merge branch 'piranha-objc' of ssh://github.com/uber/piranha into pir…

…anha-objc
superflyman · Nov 27, 2019 · b98cfa8 · b98cfa8
2 parents 7e7252d + 7af429c
commit b98cfa8
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 java/.gradle
-*/build/
+java/*/build/
 .idea
 piranha.iml
 objc/process

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -18,7 +18,7 @@ Small pull requests for things like typos, bug fixes, etc are always welcome.
 DOs and DON'Ts
 --------------
 
-* DO format your code using Google Java Format. 
+* DO format your code using Google Java Format (for Java), clang-format (for ObjC). 
 * DO include tests when adding new features. When fixing bugs, start with adding a test that highlights how the current behavior is broken.
 * DO keep the discussions focused. When a new or related topic comes up it's often better to create new issue than to side track the discussion.
 

diff --git a/RELEASING.md b/RELEASING.md