Permalink
Browse files

Merge branch 'master' of github.com:ascorbic/vendor

Conflicts:
	.gitmodules
  • Loading branch information...
2 parents 3ed5aa8 + 124553e commit c409ad28de862bfab7f60a7fd66fd93cfe4304c5 Matt Kane committed Jul 8, 2010
Showing with 4 additions and 0 deletions.
  1. +3 −0 .gitmodules
  2. +1 −0 doctrine
View
@@ -7,3 +7,6 @@
[submodule "facebook"]
path = facebook
url = http://github.com/facebook/php-sdk.git
+[submodule "doctrine"]
+ path = doctrine
+ url = git://github.com/ascorbic/doctrine-tracker.git
Submodule doctrine added at a397fb

0 comments on commit c409ad2

Please sign in to comment.