diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-01-05 18:35:18 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-01-05 18:35:18 +0300 |
| commit | 7a3b76297873782e2a56e77bcf55bbe950e57453 (patch) | |
| tree | 817288dd9ddce2d7f09fbbf672f9fe1eb8925335 /app/helpers/page_layout_helper.rb | |
| parent | dcca64a5230bbfd53ef5db8403d132deac4667f2 (diff) | |
| parent | 7c3c901ada6fc4a6d2d3ce7a2cf8188cf6615008 (diff) | |
Merge branch 'master' into more-opengraph
# Conflicts:
# app/views/layouts/_head.html.haml
Diffstat (limited to 'app/helpers/page_layout_helper.rb')
0 files changed, 0 insertions, 0 deletions