jl777
|
e73b2055c6
|
Merge branch 'beta' into mergemaster
# Conflicts:
# src/main.cpp
|
2018-04-16 10:16:01 +03:00 |
|
Daira Hopwood
|
90ff0c749e
|
Update my email address in the Code of Conduct.
|
2016-09-29 01:33:11 +01:00 |
|
Daira Hopwood
|
c34d662f10
|
Specify Sean as the second contact for conduct issues.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-04-10 21:48:06 +01:00 |
|
Daira Hopwood
|
254c16dd94
|
Add Code of Conduct. fixes #802
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-04-01 01:35:52 +01:00 |
|