Paula V. Quispe 9684b4d5e8 HOR-1495

2016-07-22 15:21:09 -04:00

..

bin

conflict

2016-07-22 10:59:13 -04:00

classes

HOR-1495

2016-07-22 15:21:09 -04:00

config

Solving conflicts with branch 3.1-CONTENT

2016-07-20 16:28:13 -04:00

content

Updating .po file for sprint HOR-13

2016-07-12 08:52:54 -04:00

controllers

Solving conflicts with branch 3.1-CONTENT

2016-07-20 16:28:13 -04:00

data

Solving conflicts with branch 3.1-CONTENT

2016-07-21 16:33:27 -04:00

includes

…

js

…

lib

…

menus

HOR-114

2016-06-15 16:31:38 -04:00

methods

Merged in julceslau/processmaker/3.1 (pull request #4605)

2016-07-21 18:36:45 -04:00

plugins

…

skinEngine

HOR-1240-A "Show expiration message to system..." SOLVED

2016-06-13 11:21:44 -04:00

src

Merged in dheeyi/processmaker/HOR-1442 (pull request #4586)

2016-07-22 11:08:41 -04:00

templates

HOR-788

2016-07-21 12:44:23 -04:00

test

…

xmlform

…

gulliver-win.bat

…

PmBootstrap.php

…