Merge branch 'gh-pages' of https://github.com/dcloudio/mui into gh-pages

Conflicts:
	getting-started-old/index.html
	sitemap.xml

getting-started-old/index.html

@@ -10,8 +10,13 @@
 <meta name="apple-mobile-web-app-capable" content="yes">
 <meta name="apple-mobile-web-app-status-bar-style" content="black">
 
+<<<<<<< HEAD
 <link rel="stylesheet" href="http://dcloudio.github.io/mui/dist/css/mui.min.css?v=2014-09-01 00:15:38 +0800">
 <link rel="stylesheet" href="http://dcloudio.github.io/mui/assets/css/docs.css?v=2014-09-01 00:15:38 +0800">
+=======
+<link rel="stylesheet" href="http://dcloudio.github.io/mui/dist/css/mui.min.css">
+<link rel="stylesheet" href="http://dcloudio.github.io/mui/assets/css/docs.css">
+>>>>>>> FETCH_HEAD
 
 <link rel="apple-touch-icon-precomposed" sizes="114x114" href="http://dcloudio.github.io/mui/assets/img/apple-touch-icon-114x114.png">
 
@@ -252,8 +257,13 @@ Copy any changes made here over to the README too. -->
 	</ul>
 </div>
 <script src="http://dcloudio.github.io/mui/dist/js/jquery-2.1.1.js"></script>
+<<<<<<< HEAD
 <script src="http://dcloudio.github.io/mui/dist/js/mui.min.js?v=2014-09-01 00:15:38 +0800"></script>
 <script src="http://dcloudio.github.io/mui/assets/js/docs.min.js?v=2014-09-01 00:15:38 +0800"></script>
+=======
+<script src="http://dcloudio.github.io/mui/dist/js/mui.min.js"></script>
+<script src="http://dcloudio.github.io/mui/assets/js/docs.min.js"></script>
+>>>>>>> FETCH_HEAD
 
   </div>
 </div>

sitemap.xml

@@ -2,7 +2,11 @@
 <urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
   <url>
     <loc>http://dcloudio.github.io/mui/</loc>
+<<<<<<< HEAD
     <lastmod>2014-09-01T00:15:38+08:00</lastmod>
+=======
+    <lastmod>2014-08-31T22:20:18+08:00</lastmod>
+>>>>>>> FETCH_HEAD
     <changefreq>daily</changefreq>
     <priority>1.0</priority>
   </url>
@@ -10,7 +14,11 @@
   
   <url>
     <loc>http://dcloudio.github.io/mui/about/</loc>
+<<<<<<< HEAD
     <lastmod>2014-09-01T00:15:38+08:00</lastmod>
+=======
+    <lastmod>2014-08-31T22:20:18+08:00</lastmod>
+>>>>>>> FETCH_HEAD
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
@@ -19,7 +27,11 @@
   
   <url>
     <loc>http://dcloudio.github.io/mui/components/</loc>
+<<<<<<< HEAD
     <lastmod>2014-09-01T00:15:38+08:00</lastmod>
+=======
+    <lastmod>2014-08-31T22:20:18+08:00</lastmod>
+>>>>>>> FETCH_HEAD
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
@@ -28,7 +40,11 @@
   
   <url>
     <loc>http://dcloudio.github.io/mui/getting-started-old/</loc>
+<<<<<<< HEAD
     <lastmod>2014-09-01T00:15:38+08:00</lastmod>
+=======
+    <lastmod>2014-08-31T22:20:18+08:00</lastmod>
+>>>>>>> FETCH_HEAD
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
@@ -37,7 +53,11 @@
   
   <url>
     <loc>http://dcloudio.github.io/mui/getting-started/</loc>
+<<<<<<< HEAD
     <lastmod>2014-09-01T00:15:38+08:00</lastmod>
+=======
+    <lastmod>2014-08-31T22:20:18+08:00</lastmod>
+>>>>>>> FETCH_HEAD
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
@@ -48,7 +68,11 @@
   
   <url>
     <loc>http://dcloudio.github.io/mui/javascript-old/</loc>
+<<<<<<< HEAD
     <lastmod>2014-09-01T00:15:38+08:00</lastmod>
+=======
+    <lastmod>2014-08-31T22:20:18+08:00</lastmod>
+>>>>>>> FETCH_HEAD
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>
@@ -57,7 +81,11 @@
   
   <url>
     <loc>http://dcloudio.github.io/mui/javascript/</loc>
+<<<<<<< HEAD
     <lastmod>2014-09-01T00:15:38+08:00</lastmod>
+=======
+    <lastmod>2014-08-31T22:20:18+08:00</lastmod>
+>>>>>>> FETCH_HEAD
     <changefreq>weekly</changefreq>
     <priority>0.7</priority>
   </url>