Skip to content

Commit

Permalink
Merge branch 'master' into shweta
Browse files Browse the repository at this point in the history
  • Loading branch information
Roshanjossey authored Jul 30, 2019
2 parents cfe9ab5 + 731583c commit 4338fef
Show file tree
Hide file tree
Showing 253 changed files with 19,563 additions and 10,585 deletions.
425 changes: 425 additions & 0 deletions .github/CONTRIBUTING.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
* Comment below about what you've started working on.
* Add, commit, push your changes.
* Submit a pull request and add this in comments - `Addresses #<put issue number here>`
* Ask for a review in comments section of pull request.
* Ask for reviews in comments section of pull request.
* Celebrate your contribution to this project. 🎉
32 changes: 31 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,20 @@
#
.DS_Store

#eslint
#
.eslintcache

# Logs
#
logs
*.log
npm-debug.log*

# temp files
#
*.~temp

# Xcode
#
build/
Expand Down Expand Up @@ -40,7 +54,6 @@ local.properties
# node.js
#
node_modules/
npm-debug.log

# coverage
#
Expand All @@ -51,3 +64,20 @@ coverage/
#
config.json
/.vs

#Visual Studio Code
#
.vscode/*

#Sublime Text
#
*.sublime-project
*.sublime-workspace

#Vim
#
*.swp
*.swo
Session.vim
.netrwhist
*~
10 changes: 5 additions & 5 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
Examples of behaviour that contributes to creating a positive environment
include:

* Using welcoming and inclusive language.
Expand All @@ -20,7 +20,7 @@ include:
* Focusing on what is best for the community.
* Showing empathy towards other community members.

Examples of unacceptable behavior by participants include:
Examples of unacceptable behaviour by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or advances.
* Trolling, insulting/derogatory comments, and personal or political attacks.
Expand All @@ -31,13 +31,13 @@ Examples of unacceptable behavior by participants include:
## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.
behaviour and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behaviour.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
permanently any contributor for other behaviours that they deem inappropriate,
threatening, offensive, or harmful.

## Scope
Expand Down
33 changes: 0 additions & 33 deletions CONTRIBUTING.md

This file was deleted.

Loading

0 comments on commit 4338fef

Please sign in to comment.