5 Commits

Author	SHA1	Message	Date
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
Samuel Vijaykumar M	7cf1fc2adb	Changed all the indents to the spaces(tab size 4)	2014-05-14 16:05:15 +05:30
Michael Cole	46092dd1d2	Reformat and bootstrappify the client home view.	2014-05-12 22:24:14 -05:00
Amos Haviv	edd549db8c	More Naming Fixes, articles cleanup	2014-04-21 02:32:59 +03:00