diff options
| author | Azul <azul@leap.se> | 2012-11-12 19:42:00 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-11-12 19:42:00 +0100 |
| commit | a0ba5ec9c705a74b86fdb558436fb05103bf88e3 (patch) | |
| tree | 22e0562166e38eb84dc20c8e7addf3089b3af13c /.gitignore | |
| parent | 05ea71016fd54a14159c72299c25efbdc2f177bc (diff) | |
| parent | fe8b49232d31681667badaaeff7aa4d0a40445ea (diff) | |
Merge branch 'develop' into feature-client-side-validations
Conflicts:
Gemfile.lock
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -22,4 +22,4 @@ test/dummy/log/* test/dummy/tmp/* # Ignore configuration file. -config/config.yml
\ No newline at end of file +config/config.ymlGemfile.lock |