Skip to content
GitLab
Explore
Sign in
RocketChat
Rocket.Chat.Electron
Repository
Rocket.Chat.Electron
.gitignore
Find file
Blame
History
Permalink
Merge remote-tracking branch 'szwacz/master'
· c5651390
Gabriel Engel
authored
Oct 23, 2015
Conflicts: package.json tasks/build.js
c5651390