feature: conflict with master resolved (500758ee) · Commits · Applications / Orbit · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Orbit
- Activity
- Members
- Labels
- Environments
- Incidents

Snippets Groups Projects

500758ee

Verified Commit 500758ee authored 4 years ago by Gaëlle Morin

Downloads
- Plain Diff

feature: conflict with master resolved

parents 935a091a fae3025c

No related branches found

No related tags found

1 merge request!255major: release integration of the hubl styling framework

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

internal/assets.js 1 addition, 1 deletion

internal/assets.js
src/dependencies.pug 9 additions, 9 deletions

src/dependencies.pug
src/index.pug 1 addition, 1 deletion

src/index.pug
src/locales/en.json 1 addition, 1 deletion

src/locales/en.json
src/views/page-polls.pug 1 addition, 0 deletions

src/views/page-polls.pug
src/views/page-resources.pug 5 additions, 5 deletions

src/views/page-resources.pug

with 18 additions and 17 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment