b80dd3d242
Merge branch 'master' into non-interactive-aws-install Conflicts: doc/installation.md Fix merge mess in installation.md |
||
---|---|---|
.. | ||
helpers | ||
mailers | ||
models | ||
observers | ||
requests | ||
roles | ||
support | ||
workers | ||
factories.rb | ||
factories_spec.rb | ||
seed_project.tar.gz | ||
spec_helper.rb |