Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
JoshEllinger committed Apr 12, 2016
2 parents ed5034c + bd13f54 commit dc4e819
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
4 changes: 2 additions & 2 deletions bower.json
Expand Up @@ -13,7 +13,7 @@
"apps"
],
"license": "Apache-2.0",
"homepage": "https://github.com/lucidworks/fusion-seed-app",
"homepage": "https://github.com/lucidworks/lucidworks-view",
"ignore": [
"**/.*",
"node_modules",
Expand All @@ -36,4 +36,4 @@
"resolutions": {
"angular": "1.3.x - 1.4.x"
}
}
}
11 changes: 7 additions & 4 deletions package.json
@@ -1,7 +1,7 @@
{
"name": "lucidworks-view",
"version": "1.0.0",
"description": "Lucidworks View: A easy to use Fusion powered UI for Search",
"description": "Lucidworks View: Create custom user experiences for your Fusion-powered apps.",
"repository": {
"type": "git",
"url": "git+https://github.com/lucidworks/lucidworks-view.git"
Expand All @@ -12,14 +12,17 @@
"angular",
"search"
],
"authors": [
"author": "Joshua Ellinger <joshua.ellinger@lucidworks.com>",
"contributors": [
"Joshua Ellinger <joshua.ellinger@lucidworks.com>",
"Arjit Dasgupta <arjit.dasgupta@lucidworks.com>"
],
"license": "Apache-2.0",
"bugs": {
"url": "https://github.com/Lucidworks/lucidworks-view/issues"
"url": "https://github.com/lucidworks/lucidworks-view/issues"
},
"homepage": "https://github.com/Lucidworks/lucidworks-view#readme",
"changelog": "https://github.com/lucidworks/lucidworks-view/blob/master/CHANGELOG.md",
"homepage": "https://lucidworks.com/products/view",
"scripts": {
"start": "./node_modules/gulp/bin/gulp.js",
"build": "./node_modules/gulp/bin/gulp.js build --production",
Expand Down

0 comments on commit dc4e819

Please sign in to comment.