diff options
author | Job van der Voort <jobvandervoort@gmail.com> | 2015-05-21 10:38:22 +0200 |
---|---|---|
committer | Job van der Voort <jobvandervoort@gmail.com> | 2015-05-21 10:38:22 +0200 |
commit | 3a3f4b41e67485e62b2e37cc395f3407b30a7d9e (patch) | |
tree | 2af95de20055ae6efb95ecb21976e5e534162e63 /Gemfile | |
parent | 90b1019ab42985568025c26164dad869677e3e1d (diff) | |
parent | 10620c5986dea30d6a2c9c5d7dcd15244bddec8e (diff) | |
download | gitlab-ce-3a3f4b41e67485e62b2e37cc395f3407b30a7d9e.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -94,7 +94,7 @@ gem "seed-fu" # Markdown and HTML processing gem 'html-pipeline', '~> 1.11.0' -gem 'task_list', '~> 1.0.0', require: 'task_list/railtie' +gem 'task_list', '1.0.2', require: 'task_list/railtie' gem 'github-markup' gem 'redcarpet', '~> 3.2.3' gem 'RedCloth' |