Merge remote-tracking branch 'origin/master'

SebRut · Jan 25, 2015 · abffbcf · abffbcf
2 parents 7efafe5 + ae3e520
commit abffbcf
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/README.md b/README.md
@@ -15,6 +15,7 @@
 * Auto updating functionality
 * conflict finder
 * execute script at install / uninstall
+* autoexec editor
 
 ##Screenshots
 ![Main view](http://i.imgur.com/AccqRUs.png)