3 commits

Author	SHA1	Message	Date
jo	d8195f0fd8	Fix trailing whitespaces in files	2021-06-04 17:06:05 +02:00
jo	65f7b41487	Fix spelling	2021-06-04 17:04:53 +02:00
Albert Santoni	2ac3633f69	3-way git merge driver for PO files and development bootstrapping script (the start of it anyways)	2014-08-27 16:43:54 -04:00