Author: kwright
Date: Sat Mar 25 08:33:13 2017
New Revision: 1788649
URL: http://svn.apache.org/viewvc?rev=1788649&view=rev
Log:
Pull up later changes from the CONNECTORS-1196-3 branch
Removed:
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/css/print.css
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/less/print.less
Modified:
manifoldcf/trunk/ (props changed)
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/index.jsp
Propchange: manifoldcf/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 25 08:33:13 2017
@@ -56,7 +56,7 @@
/manifoldcf/branches/CONNECTORS-1177:1670213-1670613
/manifoldcf/branches/CONNECTORS-1196:1783604-1786951
/manifoldcf/branches/CONNECTORS-1196-2:1786970-1788220
-/manifoldcf/branches/CONNECTORS-1196-3:1788304-1788529
+/manifoldcf/branches/CONNECTORS-1196-3:1788304-1788648
/manifoldcf/branches/CONNECTORS-120:1406712-1407974,1407982-1411043,1411049-1416451
/manifoldcf/branches/CONNECTORS-120-1:1416450-1417056
/manifoldcf/branches/CONNECTORS-1204:1682204-1682409
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/index.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/index.jsp?rev=1788649&r1=1788648&r2=1788649&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/index.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/index.jsp Sat Mar 25
08:33:13 2017
@@ -35,7 +35,6 @@
<link href="bootstrap-select/css/bootstrap-select.min.css"
rel="stylesheet" type="text/css"/>
<link href="css/font-awesome.min.css" rel="stylesheet" type="text/css"/>
<link rel="stylesheet" href="css/style.css" type="text/css"
media="screen"/>
- <link rel="stylesheet" href="css/print.css" type="text/css" media="print"/>
</head>
<body class="fixed skin-black sidebar-mini">
<div class="wrapper">
