Skip to content
This repository has been archived by the owner on Aug 30, 2021. It is now read-only.

Commit

Permalink
Merge branch 'master' of https://github.com/linnovate/mean
Browse files Browse the repository at this point in the history 
Conflicts:
	config/config.js
  • Loading branch information
Roie Schwaber-Cohen committed Aug 5, 2013
2 parents 93c9a2c + 0f948dc commit 69ccd09
Showing 1 changed file with 0 additions and 0 deletions.
Empty file modified config/config.js
100755 → 100644
View file
Empty file.

0 comments on commit 69ccd09

Please sign in to comment.