Merge remote-tracking branch 'refs/remotes/origin/trio-dev-translations' · c5c5e6f14f - Gogs

Sfoglia il codice sorgente

Merge remote-tracking branch 'refs/remotes/origin/trio-dev-translations'

#Conflicts:
#	Trio/Sources/Localizations/Main/Localizable.xcstrings
#	Trio/Sources/Services/WatchManager/AppleWatchManager.swift

t1dude 1 anno fa

parent

5acf53a4f3 801b5e13f6

commit

c5c5e6f14f

1 ha cambiato i file con 1 aggiunte e 1 eliminazioni

Visualizzazione separata Mostra Diff Stats

						
							+ 1
							
							- 1
						
Trio/Sources/Localizations/Main/Localizable.xcstrings
							 
								Vedi File
							
				@@ -247387,4 +247387,4 @@
			
				     }
			
				   },
			
				   "version" : "1.0"
			
				-}
			
				+}