Skip to content
Commit db6e6a3e authored by Tomusdrw's avatar Tomusdrw
Browse files

Merge branch 'master' into clippy 

Conflicts:
	src/service.rs
	src/views.rs
parents 1b6dead1 17969dcc
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment