Skip to content
Commit d0496894 authored by Elvis Angelaccio's avatar Elvis Angelaccio
Browse files

Merge branch 'master' into frameworks 

Conflicts:
	src/kronometer.kcfg
	src/main.cpp
	src/mainwindow.cpp
	src/widgets/guisettings.ui
parents e2d2d259 8dbc93a8
Expand all 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