Merge branch 'composer' of github.com:fayland/mackup into fayland-com…

…poser Conflicts: CHANGELOG.md
jverdeyen · Oct 19, 2014 · 5fb2423 · 5fb2423
2 parents 7ec1485 + 5193fe9
commit 5fb2423
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Support for Houdini (via @kfinlay)
 - Support for IntelliJ IDEA 13 (via @dsager)
 - Support for Pass (via @kykim)
+- Support for Composer (via @fayland)
 
 ## Mackup 0.7.4
 

diff --git a/README.md b/README.md
@@ -161,6 +161,7 @@ See the [README](doc/README.md) file in the doc directory for more info.
   - [CloudApp](http://getcloudapp.com/)
   - [Coda 2](http://panic.com/coda/)
   - [Colloquy](http://colloquy.info/)
+  - [Composer](https://getcomposer.org/)
   - [Concentrate](http://www.getconcentrating.com/)
   - [ControlPlane](http://www.controlplaneapp.com/)
   - [CoRD](http://cord.sourceforge.net/)

diff --git a/mackup/applications/composer.cfg b/mackup/applications/composer.cfg
@@ -0,0 +1,6 @@
+[application]
+name = composer
+
+[configuration_files]
+.composer/auth.json
+.composer/config.json