Merge branch 'maint-1.0' into maint-1.1
- maint-1.0: installation: MathJax distribution location update
Conflicts:
Makefile.am
Signed-off-by: Tibor Simko <tibor.simko@cern.ch>
Tibor Simko <tibor.simko@cern.ch> | Jan 30 2015, 16:18 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
46eae335f2cd | Tibor Simko | installation: MathJax distribution location update | Jan 30 2015 |