Merge branch 'master-tademo' of ssh://taforever.com:222/ta-forever/featured_mods into tazero-alpha4d
# Conflicts: # .gitattributes
This commit is contained in:
@@ -2,3 +2,4 @@ online.dll filter=lfs diff=lfs merge=lfs -text
|
||||
TA_Features_2013.ccx filter=lfs diff=lfs merge=lfs -text
|
||||
TAZ31.gp3 filter=lfs diff=lfs merge=lfs -text
|
||||
TotalA.exe filter=lfs diff=lfs merge=lfs -text
|
||||
TADEMO.UFO filter=lfs diff=lfs merge=lfs -text
|
||||
|
||||
Reference in New Issue
Block a user