Skip to content

Commit b75c4c5

Browse files
committed
Merge branch 'master' into emulate-options
Conflicts: backbone.js test/sync.js
2 parents ed5eb58 + 91ce6c3 commit b75c4c5

26 files changed

+616
-357
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
raw
22
*.sw?
33
.DS_Store
4-
node_modules

.travis.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
## How to contribute to Backbone.js
2+
3+
* Before you open a ticket or send a pull request, [search](https://github.com/documentcloud/backbone/issues) for previous discussions about the same feature or issue. Add to the earlier ticket if you find one.
4+
5+
* Before sending a pull request for a feature, be sure to have [tests](http://backbonejs.org/test/test.html).
6+
7+
* Use the same coding style as the rest of the [codebase](https://github.com/documentcloud/backbone/blob/master/backbone.js).
8+
9+
* In your pull request, do not add documentation or re-build the minified `backbone-min.js` file. We'll do those things before cutting a new release.

0 commit comments

Comments
 (0)