Merge branch 'master' of github.com:leanote/leanote

2014-05-07 13:48:28 +08:00
commit de9b0e33f7
@@ -8,3 +8,4 @@ conf/app.conf
 conf/routes
 public/upload
 .DS_Store
+.settings
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-encoding//conf/routes=UTF-8
-encoding//conf/routes-default=UTF-8