You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
parallel-library/cps/translations
Ozzieisaacs b4d7733e0a Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/list.html
#	cps/translations/cs/LC_MESSAGES/messages.po
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/translations/es/LC_MESSAGES/messages.po
#	cps/translations/fi/LC_MESSAGES/messages.po
#	cps/translations/fr/LC_MESSAGES/messages.po
#	cps/translations/hu/LC_MESSAGES/messages.po
#	cps/translations/it/LC_MESSAGES/messages.po
#	cps/translations/ja/LC_MESSAGES/messages.po
#	cps/translations/km/LC_MESSAGES/messages.po
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/translations/pl/LC_MESSAGES/messages.po
#	cps/translations/ru/LC_MESSAGES/messages.po
#	cps/translations/sv/LC_MESSAGES/messages.po
#	cps/translations/uk/LC_MESSAGES/messages.po
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
#	messages.pot
4 years ago
..
cs/LC_MESSAGES Merge remote-tracking branch 'turkish/master' 4 years ago
de/LC_MESSAGES Merge remote-tracking branch 'turkish/master' 4 years ago
es/LC_MESSAGES Merge remote-tracking branch 'turkish/master' 4 years ago
fi/LC_MESSAGES Merge remote-tracking branch 'turkish/master' 4 years ago
fr/LC_MESSAGES Merge remote-tracking branch 'turkish/master' 4 years ago
hu/LC_MESSAGES Merge remote-tracking branch 'turkish/master' 4 years ago
it/LC_MESSAGES Merge remote-tracking branch 'turkish/master' 4 years ago
ja/LC_MESSAGES Merge remote-tracking branch 'turkish/master' 4 years ago
km/LC_MESSAGES Merge remote-tracking branch 'turkish/master' 4 years ago
nl/LC_MESSAGES Merge branch 'master' into Develop 4 years ago
pl/LC_MESSAGES Merge remote-tracking branch 'turkish/master' 4 years ago
ru/LC_MESSAGES Merge remote-tracking branch 'turkish/master' 4 years ago
sv/LC_MESSAGES Merge remote-tracking branch 'turkish/master' 4 years ago
tr/LC_MESSAGES Merge remote-tracking branch 'turkish/master' 4 years ago
uk/LC_MESSAGES Merge remote-tracking branch 'turkish/master' 4 years ago
zh_Hans_CN/LC_MESSAGES Merge remote-tracking branch 'turkish/master' 4 years ago