Fix merge conflicts
[phpmyadmin.git] / libraries / plugins / 
tree70dd20d72dbc5e6cef70796f4877dc506685d868
drwxr-xr-x   ..
-rw-r--r-- 1040 AuthenticationPlugin.class.php
-rw-r--r-- 5167 ExportPlugin.class.php
-rw-r--r-- 1138 ImportPlugin.class.php
-rw-r--r-- 3024 PluginManager.class.php
-rw-r--r-- 2236 PluginObserver.class.php
-rw-r--r-- 875 TransformationsInterface.int.php
-rw-r--r-- 1270 TransformationsPlugin.class.php
-rw-r--r-- 639 UploadInterface.int.php
drwxr-xr-x - auth
drwxr-xr-x - export
drwxr-xr-x - import
drwxr-xr-x - transformations