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

@@ -187,5 +187,12 @@ namespace Octokit.Reactive
/// <param name="update">New values to update the repository with</param>
/// <returns>The updated <see cref="T:Octokit.Repository"/></returns>
IObservable<Repository> Edit(string owner, string name, RepositoryUpdate update);
/// 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>
IObservableRepoCollaboratorsClient RepoCollaborators { get; }
}
}