Karel Pičman 544acbf181 Merge branch 'devel-1.5.3' ...

Conflicts:
	config/locales/pt-BR.yml

2015-08-10 09:23:50 +02:00

..

cs.yml

approval process for 3 users 'user1 AND user2 AND user3' #432

2015-08-09 07:52:29 +02:00

de.yml

approval process for 3 users 'user1 AND user2 AND user3' #432

2015-08-09 07:52:29 +02:00

en.yml

approval process for 3 users 'user1 AND user2 AND user3' #432

2015-08-09 07:52:29 +02:00

es.yml

approval process for 3 users 'user1 AND user2 AND user3' #432

2015-08-09 07:52:29 +02:00

fr.yml

approval process for 3 users 'user1 AND user2 AND user3' #432

2015-08-09 07:52:29 +02:00

ja.yml

approval process for 3 users 'user1 AND user2 AND user3' #432

2015-08-09 07:52:29 +02:00

pl.yml

approval process for 3 users 'user1 AND user2 AND user3' #432

2015-08-09 07:52:29 +02:00

pt-BR.yml

Merge branch 'devel-1.5.3'

2015-08-10 09:23:50 +02:00

ru.yml

approval process for 3 users 'user1 AND user2 AND user3' #432

2015-08-09 07:52:29 +02:00

sl.yml

approval process for 3 users 'user1 AND user2 AND user3' #432

2015-08-09 07:52:29 +02:00

zh-TW.yml

approval process for 3 users 'user1 AND user2 AND user3' #432

2015-08-09 07:52:29 +02:00

zh.yml

approval process for 3 users 'user1 AND user2 AND user3' #432

2015-08-09 07:52:29 +02:00