diff options
| author | Code Raguet <ignacio.code@gmail.com> | 2013-08-16 17:19:15 (GMT) |
|---|---|---|
| committer | Code Raguet <ignacio.code@gmail.com> | 2013-08-16 17:19:15 (GMT) |
| commit | 1101373de9297176d11c7471a0cf59e6c6a7eacb (patch) | |
| tree | b4ecf5eccce50497cf903ade2f38bb8472d4fe2c /.gitignore | |
| parent | 631ccd38bb09a152eaa61892a63f78381da4f33f (diff) | |
| parent | 7cb74551d3208130961219d0dfcd4e44eb0a0a26 (diff) | |
Merge branch 'DEV'v4.11
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -5,6 +5,8 @@ webapp/webapp/media/cache/ webapp/webapp/media/image_options/* !webapp/webapp/media/image_options/empty +webapp/webapp/media/images/* +!webapp/webapp/media/images/empty webapp/webapp/env_settings.py database.db webapp/webapp/media/results_bck/* @@ -16,4 +18,4 @@ CeibalEncuesta/gtk2/scripts/*.tar.gz CeibalEncuesta/gtk2/scripts/*.run CeibalEncuesta/gtk3/scripts/*.tar.gz CeibalEncuesta/gtk3/scripts/*.run -webapp/stress_test/poll_results
\ No newline at end of file +webapp/stress_test/poll_results |