Diffusion In-Portal rINP16391

Merge of "in-portal/releases/5.2.1@16068" to "in-portal/branches/5.3.x@16094".
rINP16391
Actions

Tags

None

Subscribers

Description

Merge of "in-portal/releases/5.2.1@16068" to "in-portal/branches/5.3.x@16094".

restored changes, that were lost during inaccurate merge conflict resolution

Details

Committed

alex	Nov 8 2016, 6:32 AM

Parents

rINP16390: Merge of "in-portal/releases/5.2.1-B2@15839" to "in-portal/branches/5.3.

Branches

Unknown

Tags

Unknown

Build Status

Buildable 482
Build 482: After New Commit (Harbormaster Build Plan)

Event Timeline

alex committed rINP16391: Merge of "in-portal/releases/5.2.1@16068" to "in-portal/branches/5.3.x@16094"..Nov 8 2016, 6:32 AM

Harbormaster completed building B482: rINP16391: Merge of "in-portal/releases/5.2.1@16068" to "in-portal/branches/5.3.x@16094"..Nov 8 2016, 6:33 AM

Build #37 finished with UNSTABLE status: http://ci.in-portal.org/job/in-portal-53x/37/

alex committed rINP16391: Merge of "in-portal/releases/5.2.1@16068" to "in-portal/branches/5.3.x@16094"..Nov 8 2016, 6:32 AM

Changes (2)

				Path	Packages
	M			in-portal/branches/5.3.x/core/units/helpers/country_states_helper.php
	M			in-portal/branches/5.3.x/core/units/helpers/upload_helper.php

rINP16391

in-portal/branches/5.3.x/core/units/helpers/country_states_helper.php

Loading...

in-portal/branches/5.3.x/core/units/helpers/upload_helper.php

Loading...