Dheeyi William c487e2cde0 Merge remote-tracking branch 'upstream/3.1' into HOR-1007 ...

Conflicts:
	gulliver/system/class.rbac.php
	rbac/engine/data/mysql/insert.sql

2016-06-15 09:07:51 -04:00

..

bin

…

classes

Merged in gproly/processmaker/HOR-1060 (pull request #4377)

2016-06-14 18:55:28 -04:00

config

…

content

…

controllers

…

data

HOR-1060

2016-06-13 13:14:37 -04:00

includes

…

js

…

lib

…

menus

…

methods

R-1007

2016-06-14 13:07:06 -04:00

plugins

…

skinEngine

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

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

src

Merged in zeitmaster/processmaker/HOR-1246 (pull request #4379)

2016-06-09 18:12:39 -04:00

templates

HOR-1061 "Direct Case Link" SOLVED

2016-06-07 16:52:49 -04:00

test

…

xmlform

…

gulliver-win.bat

…

PmBootstrap.php

…