Skip to content

Commit

Permalink
Merge branch 'v2.4.6'
Browse files Browse the repository at this point in the history
Conflicts:
	Gemfile.lock
  • Loading branch information
EddyLB committed Jan 19, 2020
2 parents db3a888 + b3f8f79 commit 5495706

Sorry, this diff is taking too long to generate.

It may be too large to display on GitHub.

0 comments on commit 5495706

Please sign in to comment.