jennylee 77412ef663 Solving conflicts

2014-06-05 16:56:16 -04:00

..

bin

Little fix when $output has not defined such as a normal terminal env like jenkins job execution.

2014-05-08 09:47:39 -04:00

classes

Translation error for mafe.

2014-06-05 09:57:36 -04:00

config

Merge code github > bitbucket 2014-05-23 16:35

2014-05-23 16:32:18 -04:00

content

Updating .po and .sql files (requested by Erik)

2014-05-22 15:29:49 -04:00

controllers

little tweaks to show pmui and mafe versions on system information section

2014-05-29 17:17:15 -04:00

data

Merge code github > bitbucket 2014-05-23 16:35

2014-05-23 16:32:18 -04:00

includes

…

js

Merge remote branch 'upstream/master'

2014-06-05 16:48:38 -04:00

lib

…

menus

…

methods

Merge code from github.com to bitbucket repo 2014-06-05

2014-06-05 16:30:19 -04:00

plugins

…

skinEngine

Merge code github > bitbucket 2014-05-23 16:35

2014-05-23 16:32:18 -04:00

src

Adicion de validacion en el nombre del CASE SCHEDULER

2014-06-04 14:31:37 -04:00

templates

Merge code from github.com to bitbucket repo 2014-06-05

2014-06-05 16:30:19 -04:00

test

…

xmlform

Solving conflicts

2014-06-05 16:56:16 -04:00

gulliver-win.bat

…

PmBootstrap.php

…