diff options
| author | Pushkar Joshi | 2012-02-07 07:21:27 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-07 07:21:27 -0800 |
| commit | 4bbe42e6d01fd0f81d13357a75b40eae9925dda3 (patch) | |
| tree | 57f49ebfa5d3fcef28753b34015209edda6e620a /.gitignore | |
| parent | e7aa17a9b472640355e95c54841399f6203050d4 (diff) | |
| parent | 8950b342d1eda8bfa195372e1c17363a409651cd (diff) | |
| download | ninja-4bbe42e6d01fd0f81d13357a75b40eae9925dda3.tar.gz | |
Merge branch 'master' into pentool
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
| @@ -20,4 +20,5 @@ js/components/gradientpicker.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78 | |||
| 20 | 20 | ||
| 21 | cloud/ | 21 | cloud/ |
| 22 | 22 | ||
| 23 | /.idea/scopes/scope_settings.xml \ No newline at end of file | 23 | /.idea/scopes/scope_settings.xml |
| 24 | /_scss/compass_app_log.txt \ No newline at end of file | ||