rodrigo quelca f2d57db608 solve conflicts

2015-07-15 17:28:17 -04:00

..

bin

PM-2576 "Support for Timer-Event (End-points and Backend)" SOLVED

2015-07-07 11:51:12 -04:00

classes

PM-3065

2015-07-14 11:06:38 -04:00

config

PM-3025

2015-07-13 17:10:35 -04:00

content

Update .po file with all MAFE labels

2015-07-13 11:49:10 -04:00

controllers

Merged master into dashboards2

2015-06-15 17:29:52 -04:00

data

PM-3025

2015-07-14 18:06:22 -04:00

includes

VERACODE: I deleted two files

2015-05-04 15:04:39 -04:00

js

tickets 2787, 3063, 3001, 3061

2015-07-09 15:50:49 -04:00

lib

…

menus

PM-2914 La función RouteCase no puede probarse desde ADMIN/WEB SERVICES TEST SOLVED

2015-06-19 15:31:29 -04:00

methods

Merged in dashboards2 (pull request #2423)

2015-07-12 12:26:37 -04:00

plugins

…

skinEngine

PM-2672

2015-05-29 12:03:35 -04:00

src

http://jira.processmaker.com:8080/browse/PM-3117

2015-07-15 09:39:14 -04:00

templates

solve conflicts

2015-07-15 17:28:17 -04:00

test

correcciones incidencias veracode

2015-04-28 15:48:30 -04:00

xmlform

Merged in paulis/processmaker/PM-1060 (pull request #2361)

2015-06-25 10:58:10 -04:00

gulliver-win.bat

…

PmBootstrap.php

…