Guilherme Chaguri 855df4b552 Fix merge conflicts with dev

2023-03-15 16:26:45 -03:00

..

application_helper.rb

(bug) unable to select a new machine for an existing category

2023-03-13 12:11:56 +01:00

availability_helper.rb

(bug) invalid border color for slots

2023-02-24 15:16:57 +01:00

excel_helper.rb

(bug) unable to export statistics

2022-12-01 13:03:19 +01:00

settings_helper.rb

Added reservation deadlines for each type of reservation

2023-03-01 17:44:01 -03:00

upload_helper.rb

fixed ruby syntax with linter

2019-04-04 09:33:41 +02:00