Merge pull request #3 from fga-gpp-mds/development

Development
fga-eps-mds · Apr 19, 2018 · 636082b · 636082b
2 parents 554f093 + f1766a9
commit 636082b
Show file tree

Hide file tree

Showing 51 changed files with 1,371 additions and 489 deletions.
diff --git a/.angular-cli.json b/.angular-cli.json
@@ -19,8 +19,9 @@
       "testTsconfig": "tsconfig.spec.json",
       "prefix": "app",
       "styles": [
+        "styles.css",
         "../node_modules/materialize-css/dist/css/materialize.css",
-        "styles.css"
+        "../node_modules/font-awesome/css/font-awesome.css"
       ],
       "scripts": [
         "../node_modules/jquery/dist/jquery.js",

diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # IncluCare
 
 <p align="center">
-<a href="https://codeclimate.com/github/fga-gpp-mds/IncluCare_front"><img src="https://codeclimate.com/github/fga-gpp-mds/IncluCare_front/badges/gpa.svg"></a>
-<a href="https://travis-ci.org/fga-gpp-mds/IncluCare_front/"><img src="https://api.travis-ci.org/fga-gpp-mds/IncluCare_front.svg?branch=master"></a>
+<a href="https://codeclimate.com/github/fga-gpp-mds/2018.1-IncluCare"><img src="https://codeclimate.com/github/fga-gpp-mds/2018.1-IncluCare/badges/gpa.svg"></a>
+<a href="https://travis-ci.org/fga-gpp-mds/2018.1-IncluCare/"><img src="https://api.travis-ci.org/fga-gpp-mds/2018.1-IncluCare.svg?branch=master"></a>
 </p>  
 
 This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.7.3.