Skip to content

Develop pages#132

Open
Wrench24 wants to merge 105 commits intomasterfrom
develop-pages
Open

Develop pages#132
Wrench24 wants to merge 105 commits intomasterfrom
develop-pages

Conversation

@Wrench24
Copy link

@Wrench24 Wrench24 commented Oct 2, 2018

Increase battery efficiency

zackbloom and others added 29 commits March 12, 2013 15:02
Conflicts:
	src/coffee/messenger.coffee
Conflicts:
	build/js/messenger.js
	build/js/messenger.min.js
	package.json
Conflicts:
	build/js/messenger.js
	build/js/messenger.min.js
	package.json
	src/coffee/messenger.coffee
Conflicts:
	build/js/messenger.js
	build/js/messenger.min.js
	package.json
Conflicts:
	build/js/messenger.min.js
	spec/MessengerSpec.coffee
Conflicts:
	build/js/messenger.min.js
Conflicts:
	build/js/messenger.min.js
Conflicts:
	build/js/messenger.min.js
Conflicts:
	build/js/messenger.min.js
Conflicts:
	CHANGELOG.md
	bower.json
	build/js/messenger.js
	build/js/messenger.min.js
	component.json
	package.json
Conflicts:
	build/js/messenger.min.js
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

Comments