030872b408Merge branch 'master' of http://129.204.155.107:3000/zengwei/jixin_new
* 'master' of http://129.204.155.107:3000/zengwei/jixin_new:
群发助手
801c664a5aMerge branch 'master' of http://129.204.155.107:3000/zengwei/jixin_new
* 'master' of http://129.204.155.107:3000/zengwei/jixin_new:
修复了 dyld: Library not loaded: @rpath/libswiftCore.dylib Referenced from: /private/var/mobile/Containers/Bundle/Application/1EE407C5-D004-4F7C-88D1-35869ACA97C7/即信.app/Frameworks/JitsiMeet.framework/JitsiMeet Reason: image not found
a0691b1886Merge branch 'master' of http://129.204.155.107:3000/zengwei/jixin_new
* 'master' of http://129.204.155.107:3000/zengwei/jixin_new:
消息
11
修改了丝带 和红包 不消失
# Conflicts:
# shiku_im/shiku_im-Info.plist