Skip to content
Snippets Groups Projects
Commit 5646916b authored by Konstantin Osipov's avatar Konstantin Osipov
Browse files

Merge branch 'master' of github.com:tarantool/tarantool

parents 51ae582d 70100222
No related branches found
No related tags found
No related merge requests found
......@@ -34,16 +34,16 @@ blocks :
- "asynchronous master-master replication"
- "authentication and access control"
news:
-
- "Tarantool Meetup in Avito"
- "http://www.meetup.com/Tarantool/events/220924229/"
- "04.03"
- "2015"
-
- "Tarantool 1.6.4 is released"
- "https://groups.google.com/forum/#!topic/tarantool/F3qc_zemEYg"
- "24.11"
- "2014"
-
- "Tarantool 1.5.3 is released"
- "https://groups.google.com/forum/#!topic/tarantool/ol0cECHea-Y"
- "01.08"
- "2014"
-
- "Lua Workshop in Russia"
- "http://www.lua.org/wshop14.html"
......@@ -67,7 +67,7 @@ blocks :
format: rst
content: |
.. code-block:: lua
:linenos: inline
:linenos: none
#!/usr/bin/env tarantool
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment