Changeset de35745 in ecoalba


Ignore:
Timestamp:
Dec 16, 2015, 4:46:59 PM (8 years ago)
Author:
root <root@…>
Branches:
master
Children:
07a6408
Parents:
76d7094 (diff), c72473e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of ​https://miv.cenditel.gob.ve/ecoalba/scm/git/ecoalba

Files:
3 edited

Legend:

Unmodified
Added
Removed

  • templates/cadenas/cadenas_prod_consulta.html

    r01cd2b3 r76d7094  
    5252
    5353 
    54   $http.get('https://miv.cenditel.gob.ve/ecoalba/sistema/media/tmp/out.json')
     54  $http.get('172.16.137.27/media/tmp/out.json')
    5555         .success(function (data) {
    5656             $scope.roleList = data.Raiz;

  • templates/cadenas/cadenas_ue_consulta.html

    r01cd2b3 r76d7094  
    100100
    101101 
    102   $http.get('https://miv.cenditel.gob.ve/ecoalba/sistema/media/tmp/out.json')
     102  $http.get('172.16.137.27/media/tmp/out.json')
    103103         .success(function (data) {
    104104             $scope.roleList = data.Raiz;
Note: See TracChangeset for help on using the changeset viewer.