mirror of
				https://github.com/yiisoft/yii2.git
				synced 2025-11-04 14:46:19 +08:00 
			
		
		
		
	Merge branch 'master' of git://github.com/yiisoft/yii2
This commit is contained in:
		@ -19,7 +19,7 @@
 | 
			
		||||
    ],
 | 
			
		||||
    "require": {
 | 
			
		||||
        "yiisoft/yii2": "*",
 | 
			
		||||
        "twbs/bootstrap": "3.1.*"
 | 
			
		||||
        "twbs/bootstrap": "3.1.* | 3.0.*"
 | 
			
		||||
    },
 | 
			
		||||
    "autoload": {
 | 
			
		||||
        "psr-4": {
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user