hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHRAS-1734_PORT_PHRAS-1589' into PHRAS-1744_PORT_PHRAS-1578_1579_1621_1675_1404_1336

Browse Source 
# Conflicts:
#	resources/locales/messages.de.xlf
#	resources/locales/messages.en.xlf
#	resources/locales/messages.fr.xlf
#	resources/locales/messages.nl.xlf
#	resources/locales/validators.de.xlf
#	resources/locales/validators.en.xlf
#	resources/locales/validators.fr.xlf
#	resources/locales/validators.nl.xlf
#	resources/www/admin/styles/main.scss
This commit is contained in:
Mike Ng
2018-01-09 11:00:03 +04:00
parent 071ce25b31 4c11cfebd8
commit 4f518c605d
80 changed files with 4636 additions and 2193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

905
resources/locales/messages.de.xlf
View File

File diff suppressed because it is too large Load Diff