merge

qiu8310 · Mar 25, 2015 · 08fa43f · 08fa43f
2 parents 4cd187a + 9d90968
commit 08fa43f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,9 @@ dist
 sinaapp/*/*
 !sinaapp/*/publish.sh
 
+# doc project
+doc
+
 .tmp
 .sass-cache
 test/coverage

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.1.2
+2.1.4
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source 'http://ruby.taobao.org'
 
-ruby '2.1.2'
+ruby '2.1.4'
 
 gem 'sass', '3.4.5'
 gem 'compass', '1.0.1'

diff --git a/doc b/doc