Merge remote-tracking branch 'upstream/master' (4a29bc1f) · Commits · quey.org / quey.org · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

quey.org
- Activity
- Members
- Environments
- Terraform modules

Snippets Groups Projects

4a29bc1f

Commit 4a29bc1f authored 5 years ago by Sander Snel

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/master'

parents e7ab93b4 2f978abd

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

Vagrantfile 1 addition, 1 deletion

Vagrantfile
app/javascript/styles/mastodon/components.scss 1 addition, 0 deletions

app/javascript/styles/mastodon/components.scss
app/views/statuses/_simple_status.html.haml 4 additions, 0 deletions

app/views/statuses/_simple_status.html.haml
config/locales/en.yml 1 addition, 0 deletions

config/locales/en.yml
config/locales/simple_form.en.yml 1 addition, 1 deletion

config/locales/simple_form.en.yml

with 8 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