Merged branch master and fixed conflict

Browse Source

After Password Strength merge this branch have 2 conflict:
- gulpfile.js
- public/build/rev-manifest.json

All conflicts solved now

...

This commit is contained in:

Davide Bellini

2015-10-03 12:53:43 +02:00

parent b6056faa72 b4f7adfdfd

commit e9702e4292

34 changed files with 372 additions and 110 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

16

public/build/dist/js/all-1c16482be2.js vendored Normal file

File diff suppressed because one or more lines are too long