2 Commits (107d57a9256cdfbbb4f59665ea08311e14eb59de)

Author	SHA1	Message	Date
Christian Muehlhaeuser	54d96c79b5	Removed unnecessary conversions (#7557) ... No need to convert to the same type.	2019-07-23 19:50:39 +01:00
zeripath	baefea311f	Fix #732: Add LFS objects to base repository on merging (#7082) ... On merge we walk the merge history and ensure that all lfs objects pointed to in the history are added to the base repository. This switches from relying on having git-lfs installed on the server, (and in fact .gitattributes being correctly installed.)	2019-06-22 18:35:34 +01:00