Merge branch 'develop' into oembed_provider

This commit is contained in:
raeno 2018-12-19 22:39:44 +04:00
commit 7fb3780431
30 changed files with 169 additions and 42 deletions

8
.idea/libraries/plug_crypto.xml generated Normal file
View file

@ -0,0 +1,8 @@
<component name="libraryTable">
<library name="plug_crypto" type="mix">
<CLASSES />
<SOURCES>
<root url="file://$PROJECT_DIR$/deps/plug_crypto/lib" />
</SOURCES>
</library>
</component>