Merge branch 'master' into finn/categories

This commit is contained in:
piratefinn 2018-01-19 13:22:00 +00:00
commit fae6b7ce31
4 changed files with 14 additions and 2 deletions

View file

@ -1,3 +1,5 @@
# Force sudo due to issue in travis
sudo: required
addons: addons:
chrome: stable chrome: stable
language: node_js language: node_js

View file

@ -2,6 +2,16 @@
# Next Release # Next Release
# v0.1.3
* Made fix to Travis config
# v0.1.2
* Removed unused button
* Added ability to choose category for transaction
* Added version bump on Angular
# v0.1.1 # v0.1.1
* Redid layout on circle customer view * Redid layout on circle customer view

2
package-lock.json generated
View file

@ -1,6 +1,6 @@
{ {
"name": "localloop-web", "name": "localloop-web",
"version": "0.1.1", "version": "0.1.3",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View file

@ -1,6 +1,6 @@
{ {
"name": "localloop-web", "name": "localloop-web",
"version": "0.1.1", "version": "0.1.3",
"description": "LocalLoop Web - Web interface for LocalLoop app", "description": "LocalLoop Web - Web interface for LocalLoop app",
"author": "", "author": "",
"url": "http://www.peartrade.org", "url": "http://www.peartrade.org",