Merge remote-tracking branch 'origin/master' into lk

Conflicts:
	plugins/c9.metrics/metrics.js
pull/85/head
Lennart Kats 2015-04-14 11:03:37 +02:00
commit 3b698504c2
1 zmienionych plików z 2 dodań i 1 usunięć

1
.gitignore vendored
Wyświetl plik

@ -13,6 +13,7 @@ plugins/c9.ide.language.javascript.tern/util/sigs_ts
plugins/c9.account.billing/node_modules/
plugins/c9.account/node_modules/
plugins/c9.api.project/coverage/
plugins/c9.db.redis/coverage/
scripts/build
build/output
build/standalone/