Harry Bomrah 5f9190db39 few updates with fb integration and some other changes in user and supports data to android ... Conflicts: vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb		2013-07-30 16:43:11 +08:00
..
appstore	desktop CSS update	2013-03-05 09:39:01 +08:00
books	app manager changed plus some changes	2013-04-17 11:09:56 +08:00
patents	desktop CSS update	2013-03-05 09:39:01 +08:00
research_domain	desktop CSS update	2013-03-05 09:39:01 +08:00
research_project	desktop CSS update	2013-03-05 09:39:01 +08:00
settings	few updates with fb integration and some other changes in user and supports data to android	2013-07-30 16:43:11 +08:00
allsections.html.erb	app manager's view update	2013-07-30 16:42:46 +08:00
app_manager.html.erb	app manager's view update	2013-07-30 16:42:46 +08:00
app_view1.html.erb	Various view update and change #thmbackground tag	2013-07-30 16:43:02 +08:00
appstore.html.erb	desktop CSS update	2013-03-05 09:39:01 +08:00
books.html.erb	app manager changed plus some changes	2013-04-17 11:09:56 +08:00
compatibility.html.erb	add browser compatibility page	2013-04-17 11:07:45 +08:00
desktop.html.erb	Various view update and change #thmbackground tag	2013-07-30 16:43:02 +08:00
index.html.erb	few updates with fb integration and some other changes in user and supports data to android	2013-07-30 16:43:11 +08:00
orbit.html.erb	desktop CSS update	2013-03-05 09:39:01 +08:00
research_d.html.erb	desktop CSS update	2013-03-05 09:39:01 +08:00
research_p.html.erb	desktop CSS update	2013-03-05 09:39:01 +08:00
settings.html.erb	desktop CSS update	2013-03-05 09:39:01 +08:00