Roberto Cirillo 763b30fa04 fix merge conflicts		2021-05-14 17:06:24 +02:00
..
coding	merge from trunk	2018-10-02 10:05:43 +00:00
report	merge from trunk	2018-10-02 10:05:43 +00:00
resource	added token and region parameters.	2020-12-22 17:57:44 +01:00
service	fix merge conflicts	2021-05-14 17:06:24 +02:00
test	merge from trunk	2018-10-02 10:05:43 +00:00
transport	fix merge conflicts	2021-05-14 17:06:24 +02:00