6
7
8
Merge branch 'feature/mynotes' into develop
9
10
Merge branch 'feature/mynotes' into develop
12
13
14
Merge branch 'feature/mynotes' into develop
15
16
Merge branch 'feature/mynotes' into develop
Merge branch 'feature/admin' into develop

Conflicts:
	main.cpp
17
18
Merge branch 'feature/fix_1' into develop
20
21