Merge branch 'master' into repositoriesclient

Conflicts:
	Octokit.Reactive/Clients/IObservableRepositoriesClient.cs
	Octokit.Reactive/Clients/ObservableRepositoriesClient.cs
	Octokit/Helpers/ApiUrls.cs
	Octokit/Octokit-Mono.csproj
	Octokit/Octokit-MonoAndroid.csproj
	Octokit/Octokit-Monotouch.csproj
	Octokit/Octokit-netcore45.csproj
This commit is contained in:
Peter MacNaughton
2014-02-17 21:05:14 -07:00
214 changed files with 40211 additions and 21585 deletions

View File

@@ -19,6 +19,7 @@ namespace Octokit.Reactive
_client = client.Repository;
_connection = client.Connection;
CommitStatus = new ObservableCommitStatusClient(client);
RepoCollaborators = new ObservableRepoCollaboratorsClient(client);
}
/// <summary>
@@ -297,5 +298,12 @@ namespace Octokit.Reactive
{
return _client.Edit(owner, name, update).ToObservable();
}
/// A client for GitHub's Repo Collaborators.
/// </summary>
/// <remarks>
/// See the <a href="http://developer.github.com/v3/repos/collaborators/">Collaborators API documentation</a> for more details
/// </remarks>
public IObservableRepoCollaboratorsClient RepoCollaborators { get; private set; }
}
}