fbsanchez b1aa0fe2f2 Merge from develop ... Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7		2019-02-22 12:30:27 +01:00
..
clippy	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
en	Merge from develop	2019-02-22 12:30:27 +01:00
es	Merge branch 'ent-3436-custom-fields-como-macros-en-el-server' into 'develop'	2019-02-21 14:38:21 +01:00
ja	Merge from develop	2019-02-22 12:30:27 +01:00