OSDN Git Service

Merge branch 'master' of https://github.com/funglaub/gitlabhq into funglaub-master
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Wed, 12 Sep 2012 03:49:52 +0000 (06:49 +0300)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Wed, 12 Sep 2012 03:49:52 +0000 (06:49 +0300)
commit621affecb59b8ce5304370cfd7979fba2b73ff4e
tree2ff46b99e940d09b79c1929dae7a7ceeb7c02685
parent40eec08c99fe29963afed0f073b7bdbbfe31ac59
parent0dd94cd86ec0680432e58f2630a3a35fa84afd73
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
Gemfile
app/assets/stylesheets/main.scss
app/helpers/application_helper.rb
app/views/profile/password.html.haml
app/views/profile/show.html.haml
config/gitlab.yml.example
config/initializers/1_settings.rb