Merge pull request #44 from TheAndroidMaster/develop

Version 0.1.0
fennifith · Aug 10, 2018 · 2c68b71 · 2c68b71
2 parents 2990752 + 3f7a723
commit 2c68b71
Show file tree

Hide file tree

Showing 125 changed files with 1,464 additions and 2,226 deletions.
diff --git a/CONTRIBUTING.md → .github/CONTRIBUTING.md b/CONTRIBUTING.md → .github/CONTRIBUTING.md
@@ -4,4 +4,4 @@ As long as your pull request doesn't break the app in any way or conflict with a
 
 ## Branches
 
-I am using the `develop` branch for all changes that will not be immediately available on bintray. Most PRs should be made to the `develop` branch. The only reason that a PR should be made to `master` is when there is a typo/inconsistency in the README or a similar issue is present. If you make a PR to `master` that changes something other than a .md file, I will stare at my screen and make ugly whale noises for approximately 10 minutes before politely asking you to change the branch. Thank you.
+I am using the `develop` branch for all changes that will not be immediately available on bintray. Most PRs should be made to the `develop` branch. The only reason that a PR should be made to `master` is when there is a typo/inconsistency in the README or a similar issue (in /docs, for example) is present. If you make a PR to `master` that changes something other than a .md file, I will stare at my screen and make ugly whale noises for approximately 10 minutes before politely asking you to change the branch. Thank you.
diff --git a/Attribouter-cli/README.md b/Attribouter-cli/README.md
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@ As long as your pull request doesn't break the app in any way or conflict with a

		## Branches

		I am using the `develop` branch for all changes that will not be immediately available on bintray. Most PRs should be made to the `develop` branch. The only reason that a PR should be made to `master` is when there is a typo/inconsistency in the README or a similar issue is present. If you make a PR to `master` that changes something other than a .md file, I will stare at my screen and make ugly whale noises for approximately 10 minutes before politely asking you to change the branch. Thank you.
		I am using the `develop` branch for all changes that will not be immediately available on bintray. Most PRs should be made to the `develop` branch. The only reason that a PR should be made to `master` is when there is a typo/inconsistency in the README or a similar issue (in /docs, for example) is present. If you make a PR to `master` that changes something other than a .md file, I will stare at my screen and make ugly whale noises for approximately 10 minutes before politely asking you to change the branch. Thank you.