mirrors/barryvdh_ReflectionDocBlock
1
0
Fork 0
mirror of https://github.com/barryvdh/ReflectionDocBlock.git synced 2026-08-18 01:57:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:phpDocumentor/ReflectionDocBlock into feature/refactor-to-v2

Browse Source 
Conflicts:
	composer.json
This commit is contained in:
Mike van Riel
2015-06-13 14:32:12 +02:00
committed by Mike van Riel
parent 2c18f0e883 c80c4b84ee
commit 33ab09f4f5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.json
+1 -1
View File
@@ -25,7 +25,7 @@
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.0.x-dev" "dev-master": "3.0.x-dev"
} }
} }
} }