Commit 6a1a5fb2 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev'

parents 9025a41a 395594c0

.gitmodules

+1 −1
Original line number Diff line number Diff line 
[submodule "public/javascript/proj4js"]

	path = public/javascript/proj4js

	url = ../../../third-party/proj4js.git

	url = ../../third-party/proj4js.git

	branch = master

	ignore = dirty

[submodule "public/javascript/redmic-widgets"]

public/javascript/alertify

deleted100755 → 0
+0 −0
Original line number Diff line number Diff line 
../../node_modules/alertifyjs
 
 No newline at end of file

public/javascript/alertify

0 → 120000
+0 −0
Original line number Diff line number Diff line 
../../node_modules/alertifyjs
 
 No newline at end of file

public/javascript/cbtree

deleted100755 → 0
+0 −0
Original line number Diff line number Diff line 
../../node_modules/cbtree
 
 No newline at end of file

public/javascript/cbtree

0 → 120000
+0 −0
Original line number Diff line number Diff line 
../../node_modules/cbtree
 
 No newline at end of file