Doing a resync from mainline 8633:10895. There was one simple to resolve conflict...
[rails.git] / vendor / generators / daemon /
drwxr-xr-x   ..
-rw-r--r-- 394 daemon_generator.rb
drwxr-xr-x - templates