Hjqreturn
/
pgfqe6ch8
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2341 Commits
21 Branches
0 Tags
170 MiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'cb118cb9ff'
${ noResults }
Commit Graph

1694 Commits (cb118cb9ffbfbb0b21530676a24abb42a7d36a86)

Author SHA1 Message Date
杨树明 38a082b676 案例调整
5 years ago
杨树明 e2f1590eb6 案例调整
5 years ago
杨树明 57df28be31 Merge branches 'develop' and 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
杨树明 f22ce4b882 案例调整
5 years ago
daiao 62e783c953 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
daiao cbe8f7d00f 竞赛宣传
5 years ago
杨树明 e7aa6d1066 Merge remote-tracking branch 'origin/develop' into develop
5 years ago
杨树明 6c080cc5d8 。
5 years ago
daiao 9af83480be Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
daiao 72a617865c 竞赛引流
5 years ago
杨树明 48b38f32bb 竞赛弹窗调整
5 years ago
杨树明 8a15b45490 竞赛弹窗调整
5 years ago
杨树明 aaaabd11c1 竞赛弹窗调整
5 years ago
daiao 32eb383c19 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
daiao 6e93456f7d 禁赛弹框
5 years ago
jingquan huang b09ef90129 Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
cxt 9488a4c480 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
cxt 7b19036cb4 创建战队时搜索用户限制在20个
5 years ago
杨树明 e115495eff 调整
5 years ago
daiao 217eb50590 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
daiao 4228780e85 用户引流数据
5 years ago
p31729568 1aba3212c6 fix library form cover
5 years ago
daiao de3a76fee9 引流数据
5 years ago
jingquan huang d7659f8f3c Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
jingquan huang 7eaef1388b 众包导航
5 years ago
daiao f8eff25139 登录注册记录引流的行为
5 years ago
杨树明 1b631e6d95 调整
5 years ago
杨树明 f930d64ab5 Merge branches 'develop' and 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
5 years ago
jingquan huang da5a8e6e51 导航位置
5 years ago
杨树明 20071b3dea Merge remote-tracking branch 'origin/educoder' into educoder
5 years ago
杨树明 7f8a4dbe87 调整
5 years ago
jingquan huang 5be18346ee Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
jingquan huang 654ffd2106 众包路径
5 years ago
p31729568 48f1f9fd4b fix library tag class
5 years ago
jingquan huang c8c4f572f7 众包模块
5 years ago
p31729568 032a243287 fix
5 years ago
daiao 0a3287984f 登录注册报500
5 years ago
daiao d71c423c9a 1
5 years ago
daiao a8ebde3ce6 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
p31729568 8e3958b9e4 allow library cover blank
5 years ago
daiao ee7bca3ccf 1
5 years ago
daiao 112ac77ea7 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
杨树明 42fe6c2eb6 Merge remote-tracking branch 'origin/develop' into develop
5 years ago
杨树明 329b24d90d 调整
5 years ago
daiao 0e9c65deb0 注册报500
5 years ago
daiao 3e1aaa0f00 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
daiao d50486693b 报名问题
5 years ago
jingquan huang a07033c880 ..
5 years ago
jingquan huang 2b9bd22f25 众包权限控制
5 years ago
daiao bd44bb9e5a Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
p31729568 f300ff1ae0 fix not method id
5 years ago
daiao 396a6eb5fc 报名问题
5 years ago
cxt ee6dfc3dfe Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
cxt a89d34cc5f 调整
5 years ago
daiao 078b3ff21d Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
daiao 243de8ed7e 注册报错
5 years ago
cxt d862483a30 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
cxt e17dabc2d4 教学案例的封面图片显示
5 years ago
jingquan huang a6ed62fb30 Merge branch 'educoder' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
5 years ago
jingquan huang 64d37bd7b7 流量统计
5 years ago
daiao 3c4d6dede5 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
daiao e72476949b 去除调试用户
5 years ago
杨树明 252f93147f Merge remote-tracking branch 'origin/develop' into develop
5 years ago
杨树明 3618e36a14 教学案例调整
5 years ago
daiao db7be9a897 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
daiao 19bb00fdc5 贴吧报错
5 years ago
杨树明 60f40d94ce Merge remote-tracking branch 'origin/develop' into develop
5 years ago
杨树明 732a370736 竞赛报名窗口
5 years ago
daiao 1fdd8d0b23 1
5 years ago
cxt e480e06d1b 调整
5 years ago
daiao 3eb4e12e01 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
daiao 1287cf6d53 实训回复特别慢
5 years ago
杨树明 e2b48a52a3 调整
5 years ago
p31729568 cacf256da3 fix
5 years ago
p31729568 29c8a654e2 fix
5 years ago
p31729568 724dce7803 modify library
5 years ago
杨树明 9a3191d1ce 调整
5 years ago
杨树明 1d1c8ad33d Merge remote-tracking branch 'origin/develop' into develop
5 years ago
杨树明 8d7c58fc24 调整
5 years ago
杨树明 d4ee288476 调整案例编辑
5 years ago
daiao 84f77edead Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
daiao 64bf3611cc 运营人员引流记录
5 years ago
p31729568 7f8dba8549 library modify
5 years ago
杨树明 beb55ac95d 调整
5 years ago
杨树明 ec6193ae2c 调整
5 years ago
杨树明 3f7e7a3b6b 调整
5 years ago
杨树明 c28d9cf072 右侧悬停
5 years ago
杨树明 efa95984fd 右侧悬停
5 years ago
杨树明 4bdac4922a 教学案例首页调整
5 years ago
daiao 2a02a749eb 导出竞赛用户增加创建者列
5 years ago
daiao 7bcbd997e5 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
daiao 1fb9657b02 导出竞赛的用户手机和邮箱
5 years ago
jingquan huang 87b884786c add remote ip
5 years ago
jingquan huang d8e09b7080 log
5 years ago
jingquan huang 4a6a032b05 log
5 years ago
jingquan huang f30da8990b Merge branch 'educoder' into develop
5 years ago
jingquan huang 400de97019 流量计算的时候添加remote ip
5 years ago
jingquan huang 9005cf0bef Merge branch 'educoder' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
5 years ago
jingquan huang ef95c59e59 记录用户流量行文
5 years ago
p31729568 c28128ada8 fix competition list filter
5 years ago
cxt ebe1681f40 Merge branch 'educoder' into develop
5 years ago
cxt ce5bd629c1 Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
5 years ago
cxt 0793702299 竞赛列表页的调整
5 years ago
daiao 796f41f6a9 1
5 years ago
daiao c4ee5b138e Merge branch 'educoder' into develop
5 years ago
daiao fb1d58a97c Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
5 years ago
daiao 74cf0ca374 效果展示问题
5 years ago
p31729568 0af95aa86f competition list add filter
5 years ago
cxt 50189d2283 竞赛调整
5 years ago
cxt 58f5df5f1f Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
cxt 87b4eb3d4f 竞赛头部导航栏的active
5 years ago
p31729568 3a65e662eb fix competition setting
5 years ago
cxt 11bcc51317 竞赛调整
5 years ago
cxt d9e6af96df Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
cxt fad1780400 竞赛调整
5 years ago
p31729568 505d1dd132 modify management competition
5 years ago
p31729568 f62f35a706 competition list add category filter
5 years ago
杨树明 99a04581f0 Merge remote-tracking branch 'origin/develop' into develop
5 years ago
杨树明 96b758d7d7 竞赛导航调整
5 years ago
p31729568 3532564c68 modify competition path
5 years ago
杨树明 3953b52a09 众包调整
5 years ago
杨树明 b9bc532ab3 合并
5 years ago
杨树明 0efbf118a6 Merge remote-tracking branch 'origin/develop' into develop
5 years ago
杨树明 01872746a8 备案、众包调整
5 years ago
p31729568 1db30cbbb3 competition modify
5 years ago
p31729568 acbbf4736e library modify
5 years ago
jingquan huang 1b81191cea 众包的一些修改
5 years ago
jingquan huang f29ea837e7 huojiang 案例
5 years ago
jingquan huang f41194fdbf ..
5 years ago
jingquan huang ecaa2690ef 获奖案例
5 years ago
jingquan huang c1e78e903b 教学案例title
5 years ago
jingquan huang 1db7bde85c 登录问题
5 years ago
jingquan huang 4ef7094812 ..
5 years ago
jingquan huang 52907d1313 取消登录显示
5 years ago
jingquan huang 8c074f0c82 footer
5 years ago
jingquan huang 2df9776661 教学案例
5 years ago
p31729568 d4228c9d38 fix
5 years ago
p31729568 721c9fc980 fix
5 years ago
p31729568 9fcbd5c9ed fix
5 years ago
p31729568 886de85be1 fix project package time
5 years ago
p31729568 f1a7631255 tiding add project package
5 years ago
p31729568 6e687f518a add updated at to project package show api
5 years ago
p31729568 b9d5122e62 fix
5 years ago
p31729568 93274f78f2 modify project package
5 years ago
p31729568 7edb53ac2b project package creator should cannot bidding
5 years ago
p31729568 cb28d70419 fix
5 years ago
p31729568 1cf7c521d8 project package
5 years ago
p31729568 ebaf2390dc fix
5 years ago
p31729568 bfb796d04b modify project package
5 years ago
杨树明 c442751ab0 列表调整
5 years ago
p31729568 d7c14c3501 project package deadline limit
5 years ago
p31729568 acc9d603b3 modify project packages
5 years ago
p31729568 b18d9aef01 fix
5 years ago
p31729568 f8d12591d3 fix
5 years ago
p31729568 be1b72162b fix project package content
5 years ago
p31729568 7fe3a0888a fix
5 years ago
p31729568 f3056cfad3 Merge branch 'project_pack' into develop
5 years ago
daiao 3c80214c74 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
daiao 6390815ab5 设置关卡的超时时间
5 years ago
p31729568 65f1d1d356 competition
5 years ago
daiao 05abbfd991 Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
5 years ago
daiao 3f4300ec25 隐藏实训配置的程序最大执行时间
5 years ago
杨树明 0ef90fd228 Merge branches 'educoder' and 'project_pack' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into project_pack
5 years ago
caishi a8ef5257c9 还原教学案例
5 years ago
caishi 11b33541f6 竞赛
5 years ago
caishi da1d9b750d 竞赛列表
5 years ago
p31729568 17b50cbb97 attachment download support project package
5 years ago
p31729568 52315f5426 api current user add phone response
5 years ago
p31729568 1a39655ccc competition course add btn
5 years ago
caishi 6fa0ae62a4 查看详情弹框
5 years ago
caishi 274bfd795f 实践教学组竞赛页面新增两个按钮
5 years ago
杨树明 cba70fbbd5 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into project_pack
5 years ago
caishi eb71eece2d Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
caishi 36fbbb505a 竞赛
5 years ago
p31729568 009a762600 fix competition index
5 years ago
p31729568 94e27c417e fix
5 years ago
p31729568 cf8356d472 management project package add delete action
5 years ago
p31729568 a0214ff811 management project package list
5 years ago
p31729568 64f74caaf0 project package show api response add contact info
5 years ago
杨树明 26794ea41f Merge remote-tracking branch 'origin/project_pack' into project_pack
5 years ago
p31729568 341d65bd67 modify project package show api
5 years ago
p31729568 ec8cf98f17 project package create/update api response add id column
5 years ago
daiao 1e290bbf68 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
daiao 5cca4e05e6 增加结束时间
5 years ago
杨树明 0d5748ab18 Merge branches 'develop' and 'project_pack' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into project_pack
5 years ago
cxt 527e67d5d5 单位部门名称无法直接修改、合并的url没有联动过来
5 years ago
p31729568 e0cdef3ce9 fix project package save service
5 years ago
p31729568 737e992d04 add sort direction support
5 years ago
p31729568 5924a64239 project package
5 years ago
p31729568 05bd1ca0c8 user center project package list
5 years ago
p31729568 17231d64b8 add project package routes
5 years ago
p31729568 3f55927a7e fix encode
5 years ago
杨树明 4e6dfb0b7d Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into project_pack
5 years ago
p31729568 4d9ccfc528 project package feature
5 years ago
cxt ac9b0ac78e Merge branch 'educoder' into develop
5 years ago
cxt 77617c6248 运营人员的实训报告查看权限
5 years ago
daiao f7a2057433 新建默认会配置一个脚本
5 years ago
cxt 4b4a0d52e6 调整
5 years ago
cxt a496de41ee 调整
5 years ago
cxt 85de5b6c12 调整pdf导出
5 years ago
cxt ce83676e3d 调整pdf导出
5 years ago
cxt 89bc81d159 调整pdf导出
5 years ago
cxt 93eb64467c Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
5 years ago
cxt 63a60603f3 试用申请的短信通知调整
5 years ago
p31729568 a0feb16a6a fix competition enroll bug
5 years ago
caishi 46d0bf5ce7 附件icon
5 years ago
caishi cc57c5773f md影响
5 years ago
caishi b65e973233 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
caishi 2bbd98b252 竞赛
5 years ago
p31729568 265882fc52 library tag
5 years ago
caishi 27ed601e4d 小样式
5 years ago
caishi c2a1d23e48 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
caishi b3c341c3e0 教学案例-添加标签的选择、显示
5 years ago
daiao 4e5a5c4bce Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
daiao 92b4f88526 图片类实训评测问题：
5 years ago
caishi d4ff681b9a 教学案例-描述编辑器的高度
5 years ago
caishi cbb01a166b Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
caishi bc049be767 教学案例
5 years ago
p31729568 89dad40589 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
p31729568 d177594964 fix
5 years ago
杨树明 5346674266 Merge remote-tracking branch 'origin/develop' into develop
5 years ago
杨树明 592161700b mdwatch参数开启
5 years ago
p31729568 2bd7ebdb2c fix
5 years ago
caishi 374d91449c Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
caishi 880f9e3a6c 样式问题
5 years ago
cxt ed76941a50 调整
5 years ago
daiao 71300897a5 实训报错
5 years ago
daiao 63f9a3cac1 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
daiao 2510631db9 回复测试版
5 years ago
p31729568 1ae15fedad competition project 2019
5 years ago
caishi ac5536f3f7 即将发布tip
5 years ago
caishi a88becc482 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
caishi 776634299f 开源创新组的竞赛页面
5 years ago
p31729568 4ccde9d71c fix
5 years ago
p31729568 d7ce826e56 add competition feature
5 years ago
caishi 51558b419a Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
caishi af72a800ce 战队详情
5 years ago
cxt d61f1838fc 调整
5 years ago
caishi c408c1ecce Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
caishi a0f3a7bd1c 竞赛
5 years ago
p31729568 3c91b68f03 fix
5 years ago
p31729568 ddced1fa74 competition setting
5 years ago
caishi 92f778c598 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
caishi 2bbffda667 战队详情
5 years ago
cxt c0c9414854 隐藏实训查看弹框中的实训创建者
5 years ago
杨树明 c94b1758db 。
5 years ago
杨树明 8b61e1b146 对应实践课程文字替换
5 years ago
杨树明 26cde4774e Merge remote-tracking branch 'origin/develop' into develop
5 years ago
杨树明 9959612748 对应实践课程文字替换
5 years ago
jingquan huang 2c174fad62 项目issue的一些优化
5 years ago
jingquan huang 836dd9b1dc 项目的一些改进
5 years ago
daiao fc05ad2b2b 竞赛问题
5 years ago
daiao 0f6a51ac7c 用户首页报错
5 years ago
daiao 11f0d9c808 试卷列表报500
5 years ago
cxt 4a7337854b Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
5 years ago
daiao a90d48e5f1 课程删除帖子报500
5 years ago
p31729568 4e90213802 competition setting support 0 teacher
5 years ago
daiao a8e3b9f81a Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
5 years ago
cxt 1b2f4d8c7c Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
5 years ago
cxt b3fe83f61b 调整
5 years ago
daiao 5d1ad32eb8 消息报500
5 years ago
杨树明 a75b92e574 列表多数据问题调整，邀请码文字调整
5 years ago
p31729568 1624e9321c modify school statistic page
5 years ago
p31729568 23e2c3669b modify management school statistic list
5 years ago
p31729568 eaa56819b4 modify
5 years ago
p31729568 48e34a40b5 modify
5 years ago
p31729568 9a87534f1c published library disable publish action
5 years ago
p31729568 763dac6cd5 fix library
5 years ago
p31729568 92c5f1c925 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
p31729568 7164af459a fix
5 years ago
cxt 28dfcfbce7 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
cxt 73cb709ccc 调整
5 years ago
p31729568 91219c9e99 modify library edit && add delete library
5 years ago
cxt 4cd076a926 t调整
5 years ago
cxt b1290f9f01 生产环境】学生列表的成绩导出，“普通作业1”“试卷1”等更换成作业标题导出
5 years ago
caishi 1d64505243 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
caishi d60bf06532 教学案例首页增加一张banner图
5 years ago
cxt fe09b38e24 banner调整
5 years ago
p31729568 6e186b0c0d Merge branch 'develop' into educoder
5 years ago
p31729568 684c88fe7b modify competition gcc annotation-2019 show text
5 years ago
p31729568 90ff785469 modify competition show page link button
5 years ago
jingquan huang 40f8b52ce8 ..
5 years ago
jingquan huang 6dce6702b5 报名人数统计
5 years ago
cxt c97e882d2b 调整
5 years ago
cxt af2565c5e9 Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
5 years ago
cxt 34a2e2a436 调整
5 years ago
jingquan huang c7304cf397 新开页面
5 years ago
jingquan huang 89fdb0a4f8 案例说明西政
5 years ago
jingquan huang b7db488d3b 教学案例隐藏
5 years ago
jingquan huang ebbf6bb6a1 conflict
5 years ago
jingquan huang d699c91363 教学案例
5 years ago
cxt 9bd9e16d3b 调整
5 years ago
cxt ed23a8b130 调整
5 years ago
caishi 6b3bd7fbbc Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago
caishi 7e542c867e 教学案例细节修改
5 years ago
cxt 191a9b9786 Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
5 years ago
cxt 7957ff55d7 调整
5 years ago
p31729568 be28e6f160 modify library text
5 years ago
p31729568 84a4201231 Merge branch 'educoder' into develop
5 years ago
caishi 3556a1a82f Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
5 years ago