Elena-Cristina Conacel 0ef1cbf6cb Merge branch 'master' into githubMaster ...

# Conflicts:
#	assets/css/material-dashboard.css
#	assets/js/material-dashboard.js
#	assets/sass/material-dashboard.scss

2017-02-08 16:32:31 +02:00

..

css

- switched to 3 digits in copyright.

2017-02-08 16:13:42 +02:00

img

- initial release v1.0.0

2016-10-02 17:40:04 +03:00

js

- switched to 3 digits in copyright.

2017-02-08 16:13:42 +02:00

sass

Merge branch 'master' into githubMaster

2017-02-08 16:32:31 +02:00