ElyBy-Mirror/oauth2-server
1
0
Fork 0
mirror of https://github.com/elyby/oauth2-server.git synced 2025-05-31 14:12:07 +05:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/master' into develop

Browse Source 
Conflicts:
	.travis.yml
	README.md
This commit is contained in:
Alex Bilbie
2013-09-26 11:18:10 +01:00
parent a358835522 ed427cba37
commit 4a71c376b8
5 changed files with 51 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitattributes vendored
View File

@@ -1,4 +1,5 @@
tests/ export-ignore
phpunit.xml export-ignore
build.xml export-ignore
test export-ignore
test export-ignore
.travis.yml export-ignore