search

tempusdominus / bootstrap-4

Tempus Dominus Bootstrap 4 Datetime Picker
https://getdatepicker.com/5-4/
MIT License
611 stars 239 forks source link

Conflict merge #360

Closed Eonasdan closed 4 years ago

Eonasdan commented 4 years ago

Resolves the merge conflicts in #340

tonix-tuft commented 4 years ago

@Eonasdan Now that #340 is merged, how will we continue to develop this project?

I plan to still maintain my fork for now for other projects like react-tempusdominus-bootstrap, but would like to always keep the fork up to date with your project, or even better, use yours as a dependency of my other projects and use the fork only to develop new features, fix issues and send you pull requests. What do you think? Let me know which workflow you are planning! Thank you.