Skip to content
Snippets Groups Projects
Commit 3ee3619f authored by Milan's avatar Milan
Browse files

Merge branch 'master' into 'dependabot/bundler/jquery-rails-4.4.0' 

# Conflicts:
#   Gemfile.lock
parents 25fdc0a4 312ea5ae
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 3 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment