Merge branch 'master' into v2-merged-2

thngkaiyuan · thngkaiyuan · commit 02a47b3bc4a8 · 2016-04-10T03:06:13.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .idea/workspace.xml
 .DS_Store
 Symfony/coverage/*
+vagrant/
diff --git a/Symfony/src/Codebender/LibraryBundle/Handler/ApiHandler.php b/Symfony/src/Codebender/LibraryBundle/Handler/ApiHandler.php
@@ -1129,3 +1129,4 @@ private function curlGitRequest($url, $queryParams = '')
         return $jsonDecodedContent;
     }
 }
+
diff --git a/Symfony/web/clean_cache.php b/Symfony/web/clean_cache.php

Original file line number	Diff line number	Diff line change
`@@ -1129,3 +1129,4 @@ private function curlGitRequest($url, $queryParams = '')`
`1129`	`1129`	`return $jsonDecodedContent;`
`1130`	`1130`	`}`
`1131`	`1131`	`}`
	`1132`	`+`