diff options
| author | jessib <jessib@riseup.net> | 2012-11-12 10:48:40 -0800 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2012-11-12 10:48:40 -0800 |
| commit | 347c1d73c855cfad8c37e8a0bd98a60831151812 (patch) | |
| tree | 104c89712d9a1f7d7eefd49187a2f6bbc70a33ce /.gitignore | |
| parent | 67cb22d50193a58e4697549d9ce8a22e790a7a0d (diff) | |
| parent | fe8b49232d31681667badaaeff7aa4d0a40445ea (diff) | |
Merge branch 'develop' into help_develop
Conflicts:
help/test/functional/tickets_controller_test.rb
users/test/functional/application_controller_test.rb
users/test/support/auth_test_helper.rb
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 |