minify/.gitignore

# ignore IDE/hidden/OS cache files
*~
[._]*.s[a-w][a-z]
[._]s[a-w][a-z]
.DS_Store

/.idea/
/composer.lock
/vendor
/.php_cs.cache
/tests/compiler.jar
ignore editor backups 2016-01-22 00:57:33 +02:00			`# ignore IDE/hidden/OS cache files`
			`*~`
			`[._]*.s[a-w][a-z]`
			`[._]s[a-w][a-z]`
Seems like composer won't search forked code and match on identifier. Changing to Oyatel 2012-03-22 20:42:34 +01:00			`.DS_Store`
ignore editor backups 2016-01-22 00:57:33 +02:00
			`/.idea/`
composer.lock is in root 2015-11-23 14:49:53 +02:00			`/composer.lock`
Merge branch '2.x' into merge2x Conflicts: .gitignore HISTORY.txt README.md config.php docs/CookBook.wiki.md docs/CustomSource.wiki.md lib/Minify/CSS/UriRewriter.php min/lib/DooDigestAuth.php min/lib/FirePHP.php min/lib/JSMinPlus.php min/lib/Minify/Controller/Base.php min/lib/Minify/Loader.php min/lib/Minify/Logger.php 2016-05-12 11:03:16 -04:00			`/vendor`
setup phpcs cache 2016-01-22 00:56:05 +02:00			`/.php_cs.cache`
travis: install closure compiler 2016-12-06 17:08:58 +02:00			`/tests/compiler.jar`