Bakual 012d28b19c Merge branch 'staging' into 3.4-dev ... Conflicts: administrator/components/com_newsfeeds/tables/newsfeed.php libraries/joomla/database/driver/mysql.php libraries/joomla/database/exporter/mysql.php libraries/joomla/database/importer/mysql.php libraries/joomla/database/iterator/mysql.php libraries/joomla/database/query/mysql.php libraries/joomla/facebook/oauth.php libraries/joomla/facebook/object.php libraries/joomla/google/data/plus.php libraries/joomla/google/data/plus/activities.php libraries/joomla/google/data/plus/comments.php libraries/joomla/google/data/plus/people.php libraries/joomla/linkedin/oauth.php libraries/joomla/string/string.php libraries/joomla/table/table.php libraries/joomla/twitter/oauth.php libraries/joomla/utilities/arrayhelper.php libraries/vendor/joomla/compat/src/JsonSerializable.php libraries/vendor/joomla/string/src/Inflector.php libraries/vendor/joomla/string/src/Normalise.php		2014-10-20 15:18:09 +02:00
..
controllers	[Code Style] Changes in tag standards: frontend components. Fixes #4637	2014-10-14 23:20:45 +02:00
helpers	Merge branch 'staging' into 3.4-dev	2014-10-15 22:12:27 +02:00
models	[CS] com_finder frontend and com_newsfeed backend. Closes #4622. Closes #4619	2014-10-20 14:14:41 +02:00
views	[Code Style] Changes in tag standards: frontend components. Fixes #4637	2014-10-14 23:20:45 +02:00
controller.php	[Code Style] Changes in tag standards: frontend components. Fixes #4637	2014-10-14 23:20:45 +02:00
finder.php	Updating copyright	2013-12-31 12:25:08 +01:00
index.html	[#27348] Finder Integration: Rob Schley, Michael Babker, Elin Waring,	2011-12-21 11:05:28 -08:00
router.php	[CS] com_finder frontend and com_newsfeed backend. Closes #4622. Closes #4619	2014-10-20 14:14:41 +02:00