Merge branch 'master' into watched-client

Conflicts:
	Octokit.Reactive/Clients/IObservableActivitiesClient.cs
	Octokit.Reactive/Clients/ObservableActivitiesClient.cs
This commit is contained in:
Nigel Sampson
2014-01-30 14:13:00 +13:00
3 changed files with 5 additions and 1 deletions
@@ -4,5 +4,6 @@
{
IObservableEventsClient Events { get; }
IObservableWatchedClient Watched { get; }
IObservableStarredClient Starred { get; }
}
}
@@ -8,9 +8,12 @@
Events = new ObservableEventsClient(client);
Watched = new ObservableWatchedClient(client);
Starred = new ObservableStarredClient(client);
}
public IObservableEventsClient Events { get; private set; }
public IObservableWatchedClient Watched { get; private set; }
public IObservableStarredClient Starred { get; private set; }
}
}
@@ -5,7 +5,7 @@ using Octokit.Reactive.Internal;
namespace Octokit.Reactive
{
public class ObservableStarredClient
public class ObservableStarredClient : IObservableStarredClient
{
private IStarredClient _client;
private IConnection _connection;