diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-09-20 15:06:32 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-09-20 15:06:32 +0100 |
| commit | add084ee6047d3cae72e3e445135b122d8ba2cc8 (patch) | |
| tree | f9763b73753c44562d6572035ab71b4bae2957a0 /Capfile | |
| parent | 69103f5e83d538cd3aa9a3ea39cc5736aaec21e8 (diff) | |
| parent | aebcdc082f277b3569d1300ebeda43c503d8aec5 (diff) | |
Merge branch 'release/0.6.6'0.6.6
Conflicts:
locale/cs/app.po
locale/es/app.po
Diffstat (limited to 'Capfile')
| -rw-r--r-- | Capfile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Capfile b/Capfile new file mode 100644 index 000000000..6a798eb2b --- /dev/null +++ b/Capfile @@ -0,0 +1,4 @@ +load 'deploy' +# Uncomment if you are using Rails' asset pipeline + # load 'deploy/assets' +load 'config/deploy' # remove this line to skip loading any of the default tasks
\ No newline at end of file |