Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

condenser
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents

Snippets Groups Projects

508d0fce

Commit 508d0fce authored 5 years ago by roadscape

Downloads
- Plain Diff

Merge branch 'master' into quochuy-prevent_phishing

parents 2b38007c e7bc49da

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/app/assets/stylesheets/_themes.scss 7 additions, 1 deletion

src/app/assets/stylesheets/_themes.scss
src/app/assets/stylesheets/foundation-overrides.scss 4 additions, 0 deletions

src/app/assets/stylesheets/foundation-overrides.scss
src/app/components/cards/Comment.jsx 14 additions, 1 deletion

src/app/components/cards/Comment.jsx
src/app/locales/en.json 1 addition, 0 deletions

src/app/locales/en.json

with 26 additions and 2 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