WolverinDEV 8b548ed002 Merge branch 'master' of https://github.com/Vafin84/TeaWeb into Vafin84-master ... # Conflicts: # shared/css/static/frame/SelectInfo.scss		2019-06-09 10:36:04 +02:00
..
de_google_translate.translation	Updating translations translated via google translate	2019-04-23 18:22:04 +02:00
es_google_translate.translation	Generated a spanish translation base	2019-04-23 18:24:13 +02:00
fr_google_translate.translation	Updating translations translated via google translate	2019-04-23 18:22:04 +02:00
info.json	Generated a spanish translation base	2019-04-23 18:24:13 +02:00
pl_google_translate.translation	Updating translations translated via google translate	2019-04-23 18:22:04 +02:00
ru_google_translate.translation	Updating translations translated via google translate	2019-04-23 18:22:04 +02:00
ru_translate_vafin.translation	Updated ru_translate_vafin.translation 05.06.2019	2019-06-05 00:19:11 +03:00
template.translation	updated translations	2019-03-28 17:29:06 +01:00
template_translate.translation	Add files via upload	2019-01-06 21:47:36 +01:00
tr_google_translate.translation	Updating translations translated via google translate	2019-04-23 18:22:04 +02:00