diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-09-12 06:49:52 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-09-12 06:49:52 +0300 |
| commit | 621affecb59b8ce5304370cfd7979fba2b73ff4e (patch) | |
| tree | 2ff46b99e940d09b79c1929dae7a7ceeb7c02685 /config/database.yml.sqlite | |
| parent | 40eec08c99fe29963afed0f073b7bdbbfe31ac59 (diff) | |
| parent | 0dd94cd86ec0680432e58f2630a3a35fa84afd73 (diff) | |
| download | gitlab-ce-621affecb59b8ce5304370cfd7979fba2b73ff4e.tar.gz | |
Merge branch 'master' of https://github.com/funglaub/gitlabhq into funglaub-master
Conflicts:
Gemfile.lock
app/helpers/application_helper.rb
app/views/devise/sessions/new.html.erb
db/schema.rb
Diffstat (limited to 'config/database.yml.sqlite')
0 files changed, 0 insertions, 0 deletions