Isaac Connor ca07b951cb Merge branch 'master' into newpointone ... Conflicts: docs/installationguide/ubuntu.rst		2015-12-21 12:41:25 -05:00
..
Config	remove core.php, modify core.php.default	2015-08-29 14:53:39 -05:00
Console	Moved the api to underneath the web directory	2014-04-29 20:41:04 +00:00
Controller	removed issue #	2015-12-19 19:04:27 -05:00
Lib	Moved the api to underneath the web directory	2014-04-29 20:41:04 +00:00
Locale/eng/LC_MESSAGES	Moved the api to underneath the web directory	2014-04-29 20:41:04 +00:00
Model	removed issue #	2015-12-19 19:04:27 -05:00
Plugin	Merge master	2015-12-14 15:49:32 -05:00
Test	Moved the api to underneath the web directory	2014-04-29 20:41:04 +00:00
Vendor	Moved the api to underneath the web directory	2014-04-29 20:41:04 +00:00
View	Merged Angular UI branch API to master	2015-06-11 02:58:58 +00:00
vendor	Merged Angular UI branch API to master	2015-06-11 02:58:58 +00:00
webroot	Merged Angular UI branch API to master	2015-06-11 02:58:58 +00:00
.htaccess	Added API routing	2015-07-13 18:55:28 +00:00
index.php	Moved the api to underneath the web directory	2014-04-29 20:41:04 +00:00