Merge main into develop

terminal42 / contao-leads

Leads extension for Contao Open Source CMS; Store and manage form data with ease!

GNU Lesser General Public License v3.0

36 stars 24 forks source link

Merge main into develop #124

Closed rabauss closed 2 years ago

rabauss commented 2 years ago

This PR resolves the conflicts while merging main into develop. Hopefully everything was resolved correctly 🤔

rabauss commented 2 years ago

I need to rebase again - here is something wrong :-/

rabauss commented 2 years ago

Hopefully, now I got all changes of the last days from @qzminski merged from the main branch - was some manual work! Some changes could conflict with #125

aschempp commented 2 years ago

Thank you @rabauss