Guilherme Chaguri 855df4b552 Fix merge conflicts with dev		2023-03-15 16:26:45 -03:00
..
notification_types.rb	(feat) notify member on limit reached	2023-03-14 16:45:01 +01:00
settings.rb	Added reservation deadlines for each type of reservation	2023-03-01 17:44:01 -03:00
statistics.rb	(bug) fix missing stat subtype	2023-02-14 17:03:54 +01:00