Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/okland/accounts-phone
Browse files Browse the repository at this point in the history
Conflicts:
	package.js
  • Loading branch information
okland committed Aug 10, 2015
2 parents b9c79ed + 4e58c65 commit de6b088
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
name : 'okland:accounts-phone',
version : '0.0.14',
version : '0.0.21',
// Brief, one-line summary of the package.
summary : 'A login service based on mobile phone number, For Meteor.',
// URL to the Git repository containing the source code for this package.
Expand All @@ -17,7 +17,7 @@ Npm.depends({
});

Package.onUse(function (api) {
api.use('npm-bcrypt@0.7.7', 'server');
api.use('npm-bcrypt@=0.7.8_2', 'server');

api.use('accounts-base@1.0.2', ['client', 'server']);
// Export Accounts (etc) to packages using this one.
Expand Down

0 comments on commit de6b088

Please sign in to comment.