Merge branch 'master' into patch-2

Conflicts:
	angularfire/angularfire.d.ts
This commit is contained in:
Frank Bille
2015-05-27 07:17:28 +02:00
10 changed files with 5207 additions and 12 deletions

View File

@@ -94,7 +94,7 @@ interface AngularFireObject extends AngularFireSimpleObject {
/**
* @returns {Firebase} the original Firebase instance used to create this object.
*/
$ref(): AngularFire;
$ref(): Firebase;
/**
* Creates a 3-way data sync between this object, the Firebase server, and a
@@ -277,7 +277,7 @@ interface AngularFireArray extends Array<AngularFireSimpleObject> {
/**
* @returns {Firebase} the original Firebase ref used to create this object.
*/
$ref(): AngularFire;
$ref(): Firebase;
/**
* Listeners passed into this method are notified whenever a new change (add, updated,