Skip to content

Commit

Permalink
Merge branch 'release/0.1.14'
Browse files Browse the repository at this point in the history
  • Loading branch information
dcrockwell committed Sep 20, 2015
2 parents 8bef077 + bf56bb7 commit f28a692
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 11 deletions.
4 changes: 0 additions & 4 deletions es5/lib/model/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ var _jargon = require("jargon");

var _jargon2 = _interopRequireDefault(_jargon);

var _quirk = require("quirk");

var _quirk2 = _interopRequireDefault(_quirk);

var _incognito = require("incognito");

var _incognito2 = _interopRequireDefault(_incognito);
Expand Down
4 changes: 0 additions & 4 deletions es5/spec/model.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@ var _libAssociationSetterJs = require("../lib/associationSetter.js");

var _libAssociationSetterJs2 = _interopRequireDefault(_libAssociationSetterJs);

var _quirk = require("quirk");

var _quirk2 = _interopRequireDefault(_quirk);

var _libModelFinderJs = require("../lib/modelFinder.js");

var _testClassesJs = require("./testClasses.js");
Expand Down
1 change: 0 additions & 1 deletion es6/lib/model/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import flowsync from "flowsync";
import Datetime from "fleming";
import inflect from "jargon";
import Quirk from "quirk";
import privateData from "incognito";

import symbols from "./symbols";
Expand Down
1 change: 0 additions & 1 deletion es6/spec/model.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import Database from "almaden";
import Collection from "../lib/collection.js";
import Model from "../../";
import AssociationSetter from "../lib/associationSetter.js";
import Quirk from "quirk";
import {ModelQuery} from "../lib/modelFinder.js";
import {isPresent} from "../../";
import {User, Photo, Comment} from "./testClasses.js";
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dovima",
"version": "0.1.13",
"version": "0.1.14",
"description": "ES6 generic model with lots of useful special features.",
"main": "index.js",
"scripts": {
Expand Down

0 comments on commit f28a692

Please sign in to comment.