Skip to content

Commit

Permalink
Merge branch 'master' of github.com:firebase/quickstart-java
Browse files Browse the repository at this point in the history
  • Loading branch information
samtstern committed Jun 12, 2017
2 parents eb01b44 + d74335c commit 82b7fa4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Contributing to the Firebase Node.JS Quickstarts
# Contributing to the Firebase Java Quickstarts

We'd love for you to contribute to our source code and to make the Firebase Node.JS Quickstarts even better than it is today! Here are the guidelines we'd like you to follow:
We'd love for you to contribute to our source code and to make the Firebase Java Quickstarts even better than it is today! Here are the guidelines we'd like you to follow:

- [Code of Conduct](#coc)
- [Question or Problem?](#question)
Expand All @@ -12,19 +12,19 @@ We'd love for you to contribute to our source code and to make the Firebase Node

## <a name="coc"></a>Code of Conduct

As contributors and maintainers of the Firebase Node.JS Quickstarts project, we pledge to respect everyone who contributes by posting issues, updating documentation, submitting pull requests, providing feedback in comments, and any other activities.
As contributors and maintainers of the Firebase Java Quickstarts project, we pledge to respect everyone who contributes by posting issues, updating documentation, submitting pull requests, providing feedback in comments, and any other activities.

Communication through any of Firebase's channels (GitHub, StackOverflow, Google+, Twitter, etc.) must be constructive and never resort to personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.

We promise to extend courtesy and respect to everyone involved in this project regardless of gender, gender identity, sexual orientation, disability, age, race, ethnicity, religion, or level of experience. We expect anyone contributing to the project to do the same.

If any member of the community violates this code of conduct, the maintainers of the Firebase Node.JS Quickstarts project may take action, removing issues, comments, and PRs or blocking accounts as deemed appropriate.
If any member of the community violates this code of conduct, the maintainers of the Firebase Java Quickstarts project may take action, removing issues, comments, and PRs or blocking accounts as deemed appropriate.

If you are subject to or witness unacceptable behavior, or have any other concerns, please drop us a line at [email protected].

## <a name="question"></a>Got a Question or Problem?

If you have questions about how to use the Firebase Node.JS Quickstarts, please direct these to [StackOverflow][stackoverflow] and use the `firebase` tag. We are also available on GitHub issues.
If you have questions about how to use the Firebase Javqa Quickstarts, please direct these to [StackOverflow][stackoverflow] and use the `firebase` tag. We are also available on GitHub issues.

If you feel that we're missing an important bit of documentation, feel free to
file an issue so we can help. Here's an example to get you started:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Firebase Quickstarts for Java

A collection of quickstart samples demonstrating the Firebase APIs using the Java Server SDK. For more information, see https://firebase.google.com.
A collection of quickstart samples demonstrating the Firebase APIs using the Admin Java SDK. For more information, see https://firebase.google.com.

## How to make contributions?
Please read and follow the steps in the [CONTRIBUTING.md](CONTRIBUTING.md)
Expand Down

0 comments on commit 82b7fa4

Please sign in to comment.