Commit Graph

6 Commits

Author SHA1 Message Date
Amos Haviv
a7aa199019 Fixing indentation 2014-05-20 18:22:38 +03:00
Amos Haviv
9575fdcfd4 Fixing Conflicts 2014-05-19 17:38:07 +03:00
Amos Haviv
59fc0de43d Merge branch 'pr/63' into 0.3.1
Conflicts:
	app/tests/user.server.model.test.js
	public/modules/articles/config/articles.client.config.js
	public/modules/core/controllers/home.client.controller.js
	public/modules/core/services/menus.client.service.js
2014-05-19 17:33:01 +03:00
Michael Cole
66bf2dca4c Typo in test message: 2014-05-14 07:08:08 -05:00
Samuel Vijaykumar M
7cf1fc2adb Changed all the indents to the spaces(tab size 4) 2014-05-14 16:05:15 +05:30
Amos Haviv
44bf81a494 0.3RC
Express 4 Support
New naming convention
Glob patterns
CSS Linting
Uglify
CSS Min
Environmental Asset Management
DI Menu System
2014-04-21 00:01:01 +03:00