andycandy-de d9f4cf0569 Merge branch 'master' into feature/add_table_config ... # Conflicts: # README.md # model/setting.go # store/jsondb/jsondb.go # templates/global_settings.html # util/config.go		2023-03-20 22:43:49 +01:00
..
jsondb.go	Merge branch 'master' into feature/add_table_config	2023-03-20 22:43:49 +01:00
jsondb_wake_on_lan.go	Implements Wake On Lan and management features (#164)	2022-03-20 10:03:27 +01:00