6 Commits (c3fc12dfa2086d342fbd4e4164a7ff4f27fca661)

Author	SHA1	Message	Date
Stergios Mekras	7c46d95119	Remove unnecessary merge info from changelog and metadata file	2022-03-04 01:06:14 +01:00
Stergios Mekras	960efeff8e	Resolve conflict in merge	2022-03-04 00:58:47 +01:00
Stergios Mekras	95884d4df8	Update changelog	2022-03-03 20:09:56 +01:00
Stergios Mekras	4f5fb38d73	Update changelog	2022-03-03 19:59:20 +01:00
Ronin0000	4ddf8a94fb	Update ChangeLog	2022-03-02 09:36:11 -08:00
smekras	99c694c8e1	Create ChangeLog	2022-02-22 15:43:28 +01:00