Michael Jumper e385bfcde0 GUACAMOLE-131: Re-remove JavaScript libraries which were mistakenly re-added during merge conflict resolution.

2016-11-28 22:51:48 -08:00

..

doc/example

GUACAMOLE-119: Add Apache license boilerplate to example config files.

2016-11-12 18:16:50 -08:00

src/main

GUACAMOLE-131: Re-remove JavaScript libraries which were mistakenly re-added during merge conflict resolution.

2016-11-28 22:51:48 -08:00

.gitignore

GUACAMOLE-119: Move NetBeans-specific .gitignore entries to guacamole project.

2016-11-12 18:16:54 -08:00

pom.xml

Merge new changes for 0.9.10-incubating back to master.

2016-11-28 22:27:36 -08:00