Skip to content

Commit 0f625a4

Browse files
Merge branch 'master' into add-xhr-sync
2 parents 81c702f + 3076536 commit 0f625a4

File tree

10 files changed

+428
-95
lines changed

10 files changed

+428
-95
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,5 @@ node_modules
2929

3030
docs/
3131
dist/
32+
/.idea/
33+
/package-lock.json

.npmignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
1-
!dist/
1+
!dist/
2+
build.js
3+
.travis.yml
4+
.jshintrc
5+
.editorconfig
6+
/.idea/

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
package-lock=false

.yo-rc.json

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

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# can-ajax
22

3-
[![Join the chat at https://gitter.im/canjs/canjs](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/canjs/canjs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
3+
[![Join our Slack](https://img.shields.io/badge/slack-join%20chat-611f69.svg)](https://www.bitovi.com/community/slack?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
4+
[![Join our Discourse](https://img.shields.io/discourse/https/forums.bitovi.com/posts.svg)](https://forums.bitovi.com/?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
45
[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/canjs/can-ajax/blob/master/LICENSE)
56
[![npm version](https://badge.fury.io/js/can-ajax.svg)](https://www.npmjs.com/package/can-ajax)
67
[![Travis build status](https://travis-ci.org/canjs/can-ajax.svg?branch=master)](https://travis-ci.org/canjs/can-ajax)
@@ -23,4 +24,3 @@ The [contribution guide](https://github.com/canjs/can-ajax/blob/master/CONTRIBUT
2324
## License
2425

2526
[MIT](https://github.com/canjs/can-ajax/blob/master/LICENSE)
26-

build.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
"use strict";
12
var stealTools = require("steal-tools");
23

34
stealTools.export({

0 commit comments

Comments
 (0)