add sphera_php_events to gitignore
Merge remote-tracking branch 'upstream/joomla3' into joomla3
Merge remote-tracking branch 'upstream/joomla3' into joomla3
Revert "add sphera_php_events to gitignore"

This reverts commit d23edf932404b9c50b17eb99cff5068285a3d2b6.
Merge remote-tracking branch 'upstream/joomla3' into joomla3
correct icon name in J25

in administrator/components/com_fabrik/images we don't have
"plus-sign.png" icon
add sphera_php_events to gitignore
Merge pull request #957 from mironim/fix_icon_name

Fix icon name thx mironim!