app/controllers/companies_controller.rb · 8e8f5b31a1e702c1236a79d3ce7824ee484c5b08 · EIP / Project Forum / Project Forum · GitLab

Find file Blame History Permalink

Merge branch 'development' into 471-add-users-to-companies-based-on-their-email-suffix · 83ee80ef
Martin Mladenov authored Aug 22, 2022
```
# Conflicts:
#	config/locales/views/en.yml
#	config/locales/views/nl.yml
#	db/schema.rb
```
83ee80ef