huang 33a3b22430 Merge branch 'hjq_beidou' into develop ... Conflicts: db/schema.rb public/stylesheets/org2.css		2016-05-13 15:12:26 +08:00
..
SVG	…
dalli-2.7.2	…
email_verifier@222a9bdd72	…
generators	…
git/backend	…
gitlab-cli	版本库ZIP下载	2016-05-11 13:44:15 +08:00
grack	Merge branch 'yuanke' into develop	2016-05-13 11:39:01 +08:00
plugins	组织banner上传功能	2016-04-06 10:40:38 +08:00
rails_kindeditor	Merge branch 'yuanke' into develop	2016-05-13 11:39:01 +08:00
redmine	管理员界面添加“分享作业申请”列表	2016-05-09 18:40:21 +08:00
tasks	Merge branch 'cxt_course' into develop	2016-05-11 16:23:58 +08:00
trustie	gitlab版本库成员同步任务	2016-04-21 16:04:00 +08:00
wechat	将wechat放到项目里面	2016-04-26 10:50:54 +08:00
diff.rb	…
git_refresh_changes.py	…
legacy.rb	…
redcloth3.rb	…
redmine.rb	Merge branch 'develop' into cxt_course	2016-05-12 10:40:35 +08:00
trustie.rb	加上atall	2016-03-11 18:50:37 +08:00